fix move panel detail after update

[pettanr/pettanr.git] / app / controllers / panels_controller.rb

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 8d5d44b..c792acd 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -13,12 +13,11 @@ class PanelsController < ApplicationController
   private
   def panel_list
     set_list
-    list_result = @list.open(@operators)
-    @items = list_result.items 
-    @pager = list_result.paginate
+    @items = @list.items 
+    @pager = @list.page_status.pager
     respond_to do |format|
       format.html 
-      format.json { render json: @items.map{|i| i.attributes}.to_json }
+      list_json_format @list, format
       format.atom 
       format.rss
     end
@@ -132,15 +131,16 @@ class PanelsController < ApplicationController
     @item = Panel.edit(params[:id], @operators)
     @item.boosts 'post'
     jsn = nil
+    p params[:json]
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:panel] || jsn
-    self.model.fold_extend_settings @prm
+    @item.class.fold_extend_settings @prm
     @item.attributes = @prm
-    @item.refresh
+    # @item.refresh
     respond_to do |format|
-      if @item.store @item.packed_attributes, @operators
+      if @item.store @prm, @operators
         updated_html_format format
         updated_json_format format
       else