Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

diff --cc app/assets/javascripts/editor/panel_editor.js.coffee
index 97eb950,eaeba62..59e2ba2
--- 1/app/assets/javascripts/editor/panel_editor.js.coffee
--- 2/app/assets/javascripts/editor/panel_editor.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor.js.coffee
@@@ -134,12 -129,12 +134,12 @@@ class Editor.PanelEditor.Dialog extend
      if view['is_pickable'] and view.is_pickable()\r
        view.add_pick(@target_model)\r
      @refresh(view)\r
 +    this.$el.dialog('open')\r
    \r
    done: (params) ->\r
 -    this.$el.dialog('open')\r
    \r
-   lock: (params) ->\r
-     console.log('_lock')\r
+   deny: (params, form, safe_url) ->\r
+     @getter_proxy().http_get(safe_url, params, form)\r
    \r
    push_history: (params, str = null) ->\r
      @history.push(params, str)\r