temp

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

diff --git a/app/controllers/balloons_controller.rb b/app/controllers/balloons_controller.rb
index e218da1..745db47 100644 (file)
--- a/app/controllers/balloons_controller.rb
+++ b/app/controllers/balloons_controller.rb
@@ -10,25 +10,18 @@ class BalloonsController < ApplicationController
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
   
+  @@model = Balloon
   def index
-    @page = Balloon.page params[:page]
-    @page_size = Balloon.page_size params[:page_size]
-    @balloons = Balloon.list(@page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = Balloon.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @balloons, :model => Balloon, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render json: @balloons.to_json(Balloon.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
   
   def show
-    @item = Balloon.show(params[:id], [@user, @admin])
+    @item = Balloon.show(params[:id], @operators)
     respond_to do |format|
       format.html {
         @balloon = @item