try autotest

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

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index 95ea5ff..94ebf94 100644 (file)
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -5,11 +5,13 @@ class PanelPicturesController < ApplicationController
   # GET /panel_pictures
   # GET /panel_pictures.json
   def index
-    @panel_pictures = PanelPicture.all
+    @page = PanelPicture.page params[:page]
+    @page_size = PanelPicture.page_size params[:page_size]
+    @panel_pictures = PanelPicture.list({}, @page, @page_size)
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @panel_pictures }
+      format.json { render :json => @panel_pictures.to_json(PanelPicture.list_json_opt) }
     end
   end