temp

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

diff --git a/app/controllers/ground_pictures_controller.rb b/app/controllers/ground_pictures_controller.rb
index 9cf4159..9de2107 100644 (file)
--- a/app/controllers/ground_pictures_controller.rb
+++ b/app/controllers/ground_pictures_controller.rb
@@ -9,24 +9,24 @@ class GroundPicturesController < ApplicationController
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   end
 
+  @@model = GroundPicture
   def index
-    @page = GroundPicture.page params[:page]
-    @page_size = GroundPicture.page_size params[:page_size]
-    @ground_pictures = GroundPicture.list(@page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = GroundPicture.list_paginate(@page, @page_size)
-      }
-      format.json { render :json => @ground_pictures.to_json(GroundPicture.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
 
   def show
-    @ground_picture = GroundPicture.show(params[:id], [@user, @admin])
+    @item = GroundPicture.show(params[:id], @operators)
     respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @ground_picture.to_json(GroundPicture.show_json_opt) }
+      format.html {
+        @ground_picture = @item
+      }
+      format_prof format
+      format.json { render json: @item.to_json(GroundPicture.show_json_opt) }
     end
   end