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

[pettanr/pettanr.git] / app / assets / javascripts / controllers.js.coffee

diff --git a/app/assets/javascripts/controllers.js.coffee b/app/assets/javascripts/controllers.js.coffee
index a431b1f..2087b2d 100644 (file)
--- a/app/assets/javascripts/controllers.js.coffee
+++ b/app/assets/javascripts/controllers.js.coffee
@@ -1,11 +1,11 @@
 class Pettanr.AppController\r
   \r
-  constructor: (@params, @form, @operators) ->\r
+  constructor: (@params, @form, @operators, @gate) ->\r
     _.extend(this, Backbone.Events)\r
   \r
-  @new2: (params, form, operators) ->\r
+  @new2: (params, form, operators, gate) ->\r
     c = Pettanr[Pettanr.camelize(params['controller']) + 'Controller']\r
-    new c(params, form, operators)\r
+    new c(params, form, operators, gate)\r
   \r
   set_model: () ->\r
     @my_controller = Manifest.manifest().controllers[@params['controller']]\r
@@ -106,7 +106,6 @@ class Pettanr.AppController
   render_edit: () ->\r
     @item.boosts 'post'\r
     @render_form()\r
-    Pettanr.History.lock = {url: @item.edit_url(), form: @form}\r
   \r
   render_form: () ->\r
     @form = Locmare.Form.factory({\r
@@ -119,25 +118,21 @@ class Pettanr.AppController
     })\r
     @form.render()\r
     @trigger('ready', @form)\r
+    @trigger('lock', @params, @form)\r
   \r
   form_new: () ->\r
-    if Pettanr.History.lock\r
-      @trigger('lock', @params)\r
-    else\r
-      @set_new()\r
-      @render_form()\r
-      Pettanr.History.lock = {url: @item.new_url(), form: @form}\r
+    # how cansel on picker edit button?\r
+    @set_new()\r
+    @render_form()\r
   \r
   form_edit: () ->\r
-    if Pettanr.History.lock\r
-      @trigger('lock', @params)\r
-    else\r
-      @set_edit()\r
+    # how cansel on picker edit button?\r
+    @set_edit()\r
   \r
   post_success: (model, response) ->\r
+    @trigger('unlock', @params, @form)\r
     @trigger('redirect', @form.item.show_url())\r
     @trigger('success', model, response)\r
-    Pettanr.History.release()\r
   \r
   post_fail: (model, response) ->\r
     @trigger('fail', response)\r