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

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index f65a4bf..6114a13 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,16 +42,14 @@ 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]}
-    )
+    list_result = @list.open(@operators, params[:id])
     @items = list_result.items 
     respond_to do |format|
       format.html {
@@ -67,22 +61,6 @@ class SheetsController < ApplicationController
     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
-  
   def new
     set_new
     respond_to do |format|