From: yasushiito <yas@pen-chan.jp>
Date: Thu, 26 Mar 2015 08:55:07 +0000 (+0900)
Subject: Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=b16d4899d5e7332f572a40ba1ca32250a7952413

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

b16d4899d5e7332f572a40ba1ca32250a7952413
diff --cc app/assets/javascripts/editor/panel_editor.js.coffee
index 97eb9509,eaeba627..59e2ba2f
--- a/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()
        view.add_pick(@target_model)
      @refresh(view)
 +    this.$el.dialog('open')
    
    done: (params) ->
 -    this.$el.dialog('open')
    
-   lock: (params) ->
-     console.log('_lock')
+   deny: (params, form, safe_url) ->
+     @getter_proxy().http_get(safe_url, params, form)
    
    push_history: (params, str = null) ->
      @history.push(params, str)