fix play

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index 6b621a6..2f24813 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -30,41 +30,41 @@ class SheetsController < ApplicationController
     filer_list
   end
   
+  def show_html_format format
+    format.html {
+      if @operators.author
+        @new_panel_items = assist_items('panel', 'private')
+        #new_panel_filer = assist_filer 'panel', @new_panel_items
+        
+        @new_story_items = assist_items('story', 'private')
+        #new_story_filer = assist_filer 'story', @new_story_items
+        @fresh_story_items = assist_items('story_sheet', 'private').map {|ss| ss.story}
+        #@fresh_story_filer = assist_filer 'story', @fresh_story_items
+      end
+    }
+  end
+  
   def show
-    @item = Sheet.show(params[:id], @operators)
-
+    set_show
     respond_to do |format|
-      format.html {
-        if @operators.author
-          @new_panel_items = assist_items('panel', 'private_list')
-          @new_panel_filer = assist_filer 'panel', @new_panel_items
-          
-          @new_story_items = assist_items('story', 'private_list')
-          @new_story_filer = assist_filer 'story', @new_story_items
-          @fresh_story_items = assist_items('story_sheet', 'private_list').map {|ss| ss.story}
-          @fresh_story_filer = assist_filer 'story', @fresh_story_items
-        end
-      }
-      format_prof format
-      format.json { render json: @item.to_json(Sheet.show_json_opt) }
-      format.atom 
-      format.rss 
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
 
   def play
     @item = self.class.model.show(params[:id], @operators)
-    action_name = params[:action]
-    @action = self.class.controller.open(action_name, params, @operators)
-    @items = @action.list.items @item
+    set_play
+    list_result = @list.open(@operators, 
+      {:id => params[:id]}
+    )
+    @items = list_result.items 
     respond_to do |format|
       format.html {
-        @count = @action.list.count @item
-        @prev_offset = @action.list.prev_offset @item
-        @next_offset = @action.list.next_offset @item
         if @operators.author
-          @new_panel_items = assist_items('panel', 'private_list')
-          @new_panel_filer = assist_filer 'panel', @new_panel_items
+          @new_panel_items = assist_items('panel', 'private')
+          # @new_panel_filer = assist_filer 'panel', @new_panel_items
         end
       }
       format.json { render json: @items.to_json(self.class.model.list_json_opt) }
@@ -88,23 +88,13 @@ class SheetsController < ApplicationController
   end
   
   def new
-    @sheet = Sheet.new
-    @sheet.supply_default
-    respond_to do |format|
-      format.html
-      format.js
-      format.json { render json: @sheet.to_json(Sheet.show_json_opt) }
-    end
+    form_new
   end
-
+  
   def edit
-    @sheet = Sheet.edit(params[:id], @operators)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
     @sheet = Sheet.new
     @sheet.supply_default