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

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

diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee
index 78c5307..906723b 100644 (file)
--- a/app/assets/javascripts/controllers/panels.js.coffee
+++ b/app/assets/javascripts/controllers/panels.js.coffee
@@ -18,9 +18,8 @@ class Pettanr.PanelsController extends Pettanr.AppController
   show_html: () ->\r
     _this = this\r
     @item = new Pettanr.Panel({id: @item.get('id')}, {with_elements: true}) # retake panel for 'with_elements' mode\r
-    @item.fetch().done ->\r
-      i = new Pettanr.RelationPanel(_this.item.attributes)\r
-      view = new Pettanr.Views.Panel.Body({\r
+    @item.fetch({cache: false}).done ->\r
+      view = new Pettanr.Views.Panel.Show({\r
         el: "#pettanr",\r
         panel: _this.item,\r
         operators: _this.operators,\r
@@ -40,8 +39,10 @@ class Pettanr.PanelsController extends Pettanr.AppController
   count: () ->\r
   \r
   new: () ->\r
+    @form_new()\r
   \r
   edit: () ->\r
+    @form_edit()\r
   \r
   create: () ->\r
   \r