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

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index b6b85bc..376c68c 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -4,26 +4,20 @@ class PanelsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_scroll, :by_sheet, :by_author, :by_speech_balloon_template, :count, :count_by_scroll, :count_by_sheet, :count_by_author, :count_by_speech_balloon_template
+      :index, :show, :by_scroll, :by_sheet, :by_author, :by_speech_balloon_template
     ]
     before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy, :catch]
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
   end
   
-  def self.model
-    Panel
-  end
   private
   def panel_list
     set_list
-    list_result = @list.open(@operators, 
-      {:id => params[:id], :page => params[:page], :page_size => params[:page_size]}
-    )
-    @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.to_json }
+      list_json_format @list, format
       format.atom 
       format.rss
     end
@@ -56,11 +50,8 @@ class PanelsController < ApplicationController
   def show_html_format format
     format.html {
       if @operators.author
-        @new_scroll_items = assist_items('scroll', 'private')
-        @fresh_scroll_items = assist_items('scroll_panel', 'private').map {|sp| sp.scroll}
-        
-        @new_sheet_items = assist_items('sheet', 'private')
-        @fresh_sheet_items = assist_items('sheet_panel', 'private').map {|sp| sp.sheet}
+        @new_scroll_items = assist_items('home', 'scrolls')
+        @fresh_scroll_items = assist_items('home', 'scroll_panels').map {|sp| sp.scroll}
       end
     }
   end
@@ -70,29 +61,13 @@ class PanelsController < ApplicationController
     respond_to do |format|
       show_html_format format
       show_prof_format format
-      show_json_format format
+      if params[:with_elements]
+        show_json_format_for_root format
+      else
+        show_json_format format
+      end
     end
   end
-
-  def count
-    list_count
-  end
-  
-  def count_by_scroll
-    list_count
-  end
-  
-  def count_by_sheet
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_speech_balloon_template
-    list_count
-  end
   
   def new
     set_new
@@ -121,7 +96,8 @@ class PanelsController < ApplicationController
   end
   
   def create
-    @item = Panel.new
+    set_model
+    @item = @my_model_class.new
 #    @item.boosts 'post'
     jsn = nil
     if params[:json]
@@ -153,17 +129,17 @@ class PanelsController < ApplicationController
   
   def update
     @item = Panel.edit(params[:id], @operators)
-    @item.boost
+    @item.boosts 'post'
     jsn = nil
     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