try paging

diff --git a/Gemfile b/Gemfile
index b9b9b40..70787a1 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.1.1'
 gem 'devise', '=1.5.2'
+gem 'kaminari'
 gem 'rest-client'
 gem 'aws-s3'
 gem 'validates_existence'

diff --git a/app/models/author.rb b/app/models/author.rb
index 2281293..b234a79 100644 (file)
--- a/app/models/author.rb
+++ b/app/models/author.rb
@@ -216,7 +216,7 @@ class Author < ActiveRecord::Base
   end
   
   def self.default_resource_picture_page_size
-    100
+    25
   end
   
   def self.resource_picture_max_page_size

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index f85e866..333ca88 100644 (file)
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -88,7 +88,7 @@ class ResourcePicture < ActiveRecord::Base
   end
   
   def self.default_page_size
-    100
+    25
   end
   
   def self.max_page_size
@@ -117,7 +117,7 @@ class ResourcePicture < ActiveRecord::Base
   end
   
   def self.list_opt
-    {:include => {:license => {}, :artist => {}, :picture => {}} }
+    {:license => {}, :artist => {}, :picture => {} }
   end
   
   def self.list_json_opt
@@ -129,7 +129,8 @@ class ResourcePicture < ActiveRecord::Base
     opt.merge!(ResourcePicture.list_opt)
     opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
     opt.merge!({:conditions => ['resource_pictures.artist_id = ?', ar.id], :order => 'resource_pictures.updated_at desc'})
-    ResourcePicture.find(:all, opt)
+#    ResourcePicture.where(['resource_pictures.artist_id = ?', ar.id]).includes(ResourcePicture.list_opt).order('resource_pictures.updated_at desc').limit(page_size).offset((page -1) * page_size) 
+    Kaminari.paginate_array(ResourcePicture.where(['resource_pictures.artist_id = ?', ar.id]).includes(ResourcePicture.list_opt).order('resource_pictures.updated_at desc')).page(page).per(page_size) 
   end
   
   def self.show rid, roles

diff --git a/app/views/home/resource_pictures.html.erb b/app/views/home/resource_pictures.html.erb
index ead33de..36217f9 100644 (file)
--- a/app/views/home/resource_pictures.html.erb
+++ b/app/views/home/resource_pictures.html.erb
@@ -36,3 +36,4 @@
   </tr>
 <% end %>
 </table>
+<%= paginate(@resource_pictures) %>