temp

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

diff --git a/app/controllers/scrolls_controller.rb b/app/controllers/scrolls_controller.rb
index ff43f46..825e153 100644 (file)
--- a/app/controllers/scrolls_controller.rb
+++ b/app/controllers/scrolls_controller.rb
@@ -10,35 +10,30 @@ class ScrollsController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  @@model = Scroll
   def index
-    @page = Scroll.page params[:page]
-    @page_size = Scroll.page_size params[:page_size]
-    @scrolls = Scroll.list(@page, @page_size)
+    set_filer
+
     respond_to do |format|
-      format.html {
-        @paginate = Scroll.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @scrolls, :model => Scroll, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render json: @scrolls.to_json(Scroll.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
-    @scroll = Scroll.show(params[:id], [@user, @admin])
+    @item = Scroll.show(params[:id], @operators)
 
     respond_to do |format|
       format.html {
-        if @author
-          @new_panels = Panel.mylist(@author, 1, 5)
+        @scroll = @item
+        if @operators.author
+          @new_panels = Panel.mylist(@operators.author, 1, 5)
         end
       }
-      format.json { render json: @scroll.to_json(Scroll.show_json_opt) }
-      format.prof  { render :template => 'top/prof', :layout => true }
+      format.json { render json: @item.to_json(Scroll.show_json_opt) }
+      format_prof format
       format.atom 
       format.rss 
     end