fix:server

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index f65a4bf..0132a9d 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -4,15 +4,11 @@ class SheetsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :play, :by_story, :by_panel, :by_author, :count, :count_by_story, :count_by_panel, :count_by_author
+      :index, :show, :play, :by_story, :by_panel, :by_author
     ]
     before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
-
-  def self.model
-    Sheet
-  end
   
   def index
     filer_list
@@ -33,10 +29,10 @@ class SheetsController < ApplicationController
   def show_html_format format
     format.html {
       if @operators.author
-        @new_panel_items = assist_items('panel', 'private')
+        @new_panel_items = assist_items('home', 'panels')
         
-        @new_story_items = assist_items('story', 'private')
-        @fresh_story_items = assist_items('story_sheet', 'private').map {|ss| ss.story}
+        @new_story_items = assist_items('home', 'stories')
+        @fresh_story_items = assist_items('home', 'story_sheets').map {|ss| ss.story}
       end
     }
   end
@@ -46,43 +42,26 @@ class SheetsController < ApplicationController
     respond_to do |format|
       show_html_format format
       show_prof_format format
-      show_json_format format
+      show_json_format_for_root format
     end
   end
   
   def play
-    @item = self.class.model.show(params[:id], @operators)
     set_play
-    list_result = @list.open(@operators, 
-      {:id => params[:id]}
-    )
-    @items = list_result.items 
+    @list.options.merge!({'page_size' => -1})    # no limit no pager
+    @list.reset
+    play_list
     respond_to do |format|
       format.html {
         if @operators.author
-          @new_panel_items = assist_items('panel', 'private')
+          @new_panel_items = assist_items('home', 'panels')
         end
       }
-      format.json { render json: @items.to_json(self.class.model.list_json_opt) }
+      list_json_format @list, format
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_story
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
+=begin
   def new
     set_new
     respond_to do |format|
@@ -109,9 +88,20 @@ class SheetsController < ApplicationController
     end
   end
   
+=end
+  
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
+  
   def create
-    @sheet = Sheet.new
-    @sheet.supply_default 
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
     jsn = nil
     if params[:json]
       jsn = JSON.parse_no_except(params[:json])
@@ -119,41 +109,29 @@ class SheetsController < ApplicationController
     @prm = params[:sheet] || jsn
     
     respond_to do |format|
-      if @sheet.store @prm, @operators
+      if @item.store @prm, @operators
         created_html_format format
         created_json_format format
       else
-        format.html {
-          flash[:notice] = I18n.t('flash.notice.not_created', :model => @my_model_class.model_name.human)
-          @editor = Editor::PanelEditor.new @item, @operators
-          render :template => @editor.template_name, :locals => {
-            :editor => @editor
-          }
-        }
+        not_created_html_format format
         not_created_json_format format
       end
     end
   end
   
   def update
-    @sheet = Sheet.edit(params[:id], @operators)
+    set_edit
     jsn = nil
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
     @prm = params[:sheet] || jsn
     respond_to do |format|
-      if @sheet.store @prm, @operators
+      if @item.store @prm, @operators
         updated_html_format format
         updated_json_format format
       else
-        format.html {
-          flash[:notice] = I18n.t('flash.notice.not_updated', :model => @my_model_class.model_name.human)
-          @editor = Editor::PanelEditor.new @item, @operators
-          render :template => @editor.template_name, :locals => {
-            :editor => @editor
-          }
-        }
+        not_updated_html_format format
         not_updated_json_format format
       end
     end