X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fsheets_controller.rb;h=ab093eb52f02fdfd11ea3d74c221b4c97d36e8fb;hp=1d7505be64a8a3ec70976f8e7c1de16addc49faa;hb=02ea4fc4bbe7a54dd576c1cd700aa9e32710abf8;hpb=a932d128294165749ee3c60667077b1c1463db56

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index 1d7505be..ab093eb5 100644
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -10,37 +10,32 @@ class SheetsController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  @@model = Sheet
   def index
-    @page = Sheet.page params[:page]
-    @page_size = Sheet.page_size params[:page_size]
-    @sheets = Sheet.list(@page, @page_size)
+    set_filer
+
     respond_to do |format|
-      format.html {
-        @paginate = Sheet.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @sheets, :model => Sheet, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render json: @sheets.to_json(Sheet.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
       format.atom 
       format.rss
     end
   end
 
   def show
-    @sheet = Sheet.show(params[:id], [@user, @admin])
+    @item = Sheet.show(params[:id], @operators)
 
     respond_to do |format|
       format.html {
-        if @author
-          @new_panels = Panel.mylist(@author, 1, 5)
-          @new_stories = Story.mylist(@author, 1, 5)
-          @fresh_stories = StorySheet.mylist(@author, 1, 5).map {|ss| ss.story}
+        @sheet = @item
+        if @operators.author
+          @new_panels = Panel.mylist(@operators.author, 1, 5)
+          @new_stories = Story.mylist(@operators.author, 1, 5)
+          @fresh_stories = StorySheet.mylist(@operators.author, 1, 5).map {|ss| ss.story}
         end
       }
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @sheet.to_json(Sheet.show_json_opt) }
+      format_prof format
+      format.json { render json: @item.to_json(Sheet.show_json_opt) }
       format.atom 
       format.rss 
     end