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 2ea987a..530b774 100644 (file)
--- a/app/assets/javascripts/controllers/panels.js.coffee
+++ b/app/assets/javascripts/controllers/panels.js.coffee
@@ -38,7 +38,7 @@ class Pettanr.PanelsController extends Pettanr.AppController
   show_html: () -> \r
     @item = @item.with_elements() # retake panel for 'with_elements' mode\r
     @item.fetch({cache: true}).done =>\r
-      @item.replace_elements()\r
+      @item.attributes = @item.replaced_attributes()\r
       @trigger('title', @params, @item.get('caption'))\r
       show = new Pettanr.Views.Panel.Show({\r
         panel: @item,\r
@@ -69,7 +69,7 @@ class Pettanr.PanelsController extends Pettanr.AppController
       panel = new Pettanr.Panel({id: @params['id']})\r
       @item = panel.with_elements()\r
       @item.fetch({cache: false}).done =>\r
-        @item.replace_elements()\r
+        @item.attributes = @item.replaced_attributes()\r
         @editor(@item.edit_url())\r
         @trigger('done', @params)\r
   \r