try paging

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

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
index 51543bb..9db1452 100644 (file)
--- a/app/controllers/artists_controller.rb
+++ b/app/controllers/artists_controller.rb
@@ -36,13 +36,13 @@ class ArtistsController < ApplicationController
 
   def resource_pictures
     @ar = Artist.show(params[:id], [@user, @admin, @demand_user])
-    
     @page = Author.page params[:page]
     @page_size = Author.resource_picture_page_size params[:page_size]
-    @resource_pictures = ResourcePicture.mylist(@ar, @page, @page_size)
-
+    @resource_pictures = ResourcePicture.himlist(@ar, @page, @page_size)
     respond_to do |format|
-      format.html # index.html.erb
+      format.html {
+        @paginate = ResourcePicture.himlist_paginate(@ar, @page, @page_size)
+      }
       format.json { render json: @resource_pictures.to_json(ResourcePicture.list_json_opt) }
     end
   end