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

diff --combined 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
@@@ -19,17 -19,13 +19,17 @@@ class Editor.PanelEditor extends Backbo
      \r
      @body.on('panel:resize', @panel_resize)\r
      @listenTo(@dock, 'http_post', @http_post)\r
 +    @listenTo(@dock, 'add:element', @add_element)\r
      @listenTo(@dock, 'add:credit', @add_credit)\r
    \r
 +  add_element: (element) ->\r
 +    @body.add_element(element)\r
 +  \r
    add_credit: (element) ->\r
      @credits.add_picture(element.picture())\r
    \r
    remove_element: (element) ->\r
 -    \r
 +    @body.remove_element(element)\r
    \r
    render: () ->\r
      this.$el.html('')\r
@@@ -99,7 -95,6 +99,7 @@@ class Editor.PanelEditor.Dialog extend
      @get(params, form)\r
    \r
    stop: () ->\r
 +    @dialog().$el.dialog('close')\r
    \r
    render: () ->\r
      this.$el.html('')\r
@@@ -113,12 -108,12 +113,12 @@@
      this.$el.append(view.el)\r
    \r
    getter_proxy: () ->\r
-     proxy = new Pettanr.Proxy({operators: @operators})\r
+     proxy = new Pettanr.PickerProxy({operators: @operators})\r
      @listenTo(proxy, 'ready', @ready)\r
      @listenTo(proxy, 'title', @title)\r
      @listenTo(proxy, 'title', @push_history)\r
      @listenTo(proxy, 'done', @done)\r
-     @listenTo(proxy, 'lock', @lock)\r
+     @listenTo(proxy, 'deny', @deny)\r
      proxy\r
    \r
    http_get: (url, form) ->\r
@@@ -134,12 -129,12 +134,12 @@@
      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