try autotest

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

diff --git a/app/controllers/resource_pictures_controller.rb b/app/controllers/resource_pictures_controller.rb
index 4b17772..a68cd7c 100644 (file)
--- a/app/controllers/resource_pictures_controller.rb
+++ b/app/controllers/resource_pictures_controller.rb
@@ -5,22 +5,20 @@ class ResourcePicturesController < ApplicationController
   # GET /resource_pictures
   # GET /resource_pictures.json
   def index
-    @resource_pictures = ResourcePicture.find(:all, 
-      :include => {:original_picture => [:artist, :license]}, :order => 'updated_at', :limit => 20
-    )
+    @page = ResourcePicture.page params[:page]
+    @page_size = ResourcePicture.page_size params[:page_size]
+    @resource_pictures = ResourcePicture.list({}, @page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @resource_pictures.to_json(
-        :include => [:original_picture, :artist, :license]
-      ) }
+      format.json { render :json => @resource_pictures.to_json(ResourcePicture.list_json_opt) }
     end
   end
 
   # GET /resource_pictures/1
   # GET /resource_pictures/1.json
   def show
-    @resource_picture = ResourcePicture.find(params[:id])
+    @resource_picture = ResourcePicture.show(params[:id])
 
     respond_to do |format|
       opt = {:type => @resource_picture.mime_type, :disposition=>"inline"}
@@ -28,10 +26,17 @@ class ResourcePicturesController < ApplicationController
       format.gif { send_data(@resource_picture.restore(params[:subdir]), opt ) }
       format.jpeg { send_data(@resource_picture.restore(params[:subdir]), opt ) }
       format.html # show.html.erb
-      format.json { render json: @resource_picture}
+      format.json { render :json => @resource_picture.to_json(ResourcePicture.list_json_opt)}
     end
   end
 
+  def count
+    @resource_picture = {:count => ResourcePicture.visible_count}
+    respond_to do |format|
+      format.json { render json: @resource_picture.to_json }
+    end
+  end
+  
   def list
     @resource_pictures = ResourcePicture.all