temp

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index 5e5e86f..ab093eb 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -10,34 +10,28 @@ 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
-    @item = Sheet.show(params[:id], [@user, @admin])
+    @item = Sheet.show(params[:id], @operators)
 
     respond_to do |format|
       format.html {
         @sheet = @item
-        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}
+        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 format