temp

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

diff --git a/app/controllers/scroll_panels_controller.rb b/app/controllers/scroll_panels_controller.rb
index f694433..dfdb3a8 100644 (file)
--- a/app/controllers/scroll_panels_controller.rb
+++ b/app/controllers/scroll_panels_controller.rb
@@ -10,25 +10,25 @@ class ScrollPanelsController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  @@model = ScrollPanel
   def index
-    @page = ScrollPanel.page params[:page]
-    @page_size = ScrollPanel.page_size params[:page_size]
-    @scroll_panels = ScrollPanel.list(@page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = ScrollPanel.list_paginate(@page, @page_size)
-      }
-      format.json { render :json => @scroll_panels.to_json(ScrollPanel.list_json_opt) }
+      format_filer format
+      format.json { render :json => @items.to_json(@@model.list_json_opt) }
     end
   end
 
   def show
-    @scroll_panel = ScrollPanel.show(params[:id], [@user, @admin])
+    @item = ScrollPanel.show(params[:id], @operators)
 
     respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @scroll_panel.scroll_panel_as_json(@author) }
+      format.html {
+        @scroll_panel = @item
+      }
+      format_prof format
+      format.json { render json: @item.scroll_panel_as_json(@operators.author) }
     end
   end