X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;ds=sidebyside;f=app%2Fcontrollers%2Fpanels_controller.rb;h=e3c14a98ae4c577b129b0e13ab71bfe46f341014;hb=02ea4fc4bbe7a54dd576c1cd700aa9e32710abf8;hp=df0028c8d83e6c5cd8fd4a0c4534449d069b7c65;hpb=a932d128294165749ee3c60667077b1c1463db56;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index df0028c8..e3c14a98 100644
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -9,47 +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
-    @panel = Panel.show(params[:id], [@user, @admin])
+    @item = Panel.show(params[:id], @operators)
 
     respond_to do |format|
       format.html {
-        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}
+        @panel = @item
+        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  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @panel.panel_elements_as_json }
-      format.jsonp {
-        render :json => "callback(" + @panel.panel_elements_as_json + ");"
-      }
+      format_prof format
+      format.json { render json: @item.panel_elements_as_json }
     end
   end