temp

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index fd50073..e3c14a9 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -9,48 +9,34 @@ class PanelsController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
-
-  public
   
+  @@model = Panel
   def index
-    @page = Panel.page params[:page]
-    @page_size = Panel.page_size params[:page_size]
-    @panels = Panel.list(@page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = Panel.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @panels, :model => Panel, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.html {
-      }
-      format.json { render text: Panel.list_as_json_text(@panels) }
+      format_filer format
+      format.json { render text: @@model.list_as_json_text(@items) }
       format.atom 
       format.rss { render :layout => false }
     end
   end
 
   def show
-    @item = Panel.show(params[:id], [@user, @admin])
+    @item = Panel.show(params[:id], @operators)
 
     respond_to do |format|
       format.html {
         @panel = @item
-        if @author
-          @new_scrolls = Scroll.mylist(@author, 1, 5)
-          @fresh_scrolls = ScrollPanel.mylist(@author, 1, 5).map {|sp| sp.scroll}
-          @new_sheets = Sheet.mylist(@author, 1, 5)
-          @fresh_sheets = SheetPanel.mylist(@author, 1, 5).map {|sp| sp.sheet}
+        if @operators.author
+          @new_scrolls = Scroll.mylist(@operators.author, 1, 5)
+          @fresh_scrolls = ScrollPanel.mylist(@operators.author, 1, 5).map {|sp| sp.scroll}
+          @new_sheets = Sheet.mylist(@operators.author, 1, 5)
+          @fresh_sheets = SheetPanel.mylist(@operators.author, 1, 5).map {|sp| sp.sheet}
         end
       }
       format_prof format
       format.json { render json: @item.panel_elements_as_json }
-      format.jsonp {
-        render :json => "callback(" + @item.panel_elements_as_json + ");"
-      }
     end
   end