temp

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

diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb
index 8aa7789..a7bdd40 100644 (file)
--- a/app/controllers/speeches_controller.rb
+++ b/app/controllers/speeches_controller.rb
@@ -10,29 +10,24 @@ class SpeechesController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
+  @@model = Speech
   def index
-    @page = Speech.page params[:page]
-    @page_size = Speech.page_size params[:page_size]
-    @speeches = Speech.list(@page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = Speech.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @speeches, :model => Speech, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render json: @speeches.to_json(Speech.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
   
   def show
-    @speech = Speech.show(params[:id], [@user, @admin])
+    @item = Speech.show(params[:id], @operators)
     respond_to do |format|
-      format.html # show.html.erb
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @speech.to_json(Speech.show_json_opt) }
+      format.html {
+        @speech = @item
+      }
+      format_prof format
+      format.json { render json: @item.to_json(Speech.show_json_opt) }
     end
   end