try paging

[pettanr/pettanr.git] / app / models / resource_picture.rb

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index 0fc8f4e..30eb7e6 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
+    25
   end
   
   def self.max_page_size
@@ -108,30 +108,46 @@ class ResourcePicture < ActiveRecord::Base
     page_size
   end
   
+  def self.mylist_where ar
+    ['resource_pictures.artist_id = ?', ar.id]
+  end
+  
+  def self.himlist_where ar
+    ['resource_pictures.artist_id = ?', ar.id]
+  end
+  
   def self.list page = 1, page_size = self.default_page_size
-    opt = {}
-    opt.merge!(self.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:order => 'updated_at desc'})
-    ResourcePicture.find(:all, opt)
+    ResourcePicture.includes(ResourcePicture.list_opt).order('resource_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  end
+  
+  def self.mylist ar, page = 1, page_size = Author.default_resource_picture_page_size
+    ResourcePicture.where(self.mylist_where(ar)).includes(ResourcePicture.list_opt).order('resource_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  end
+  
+  def self.himlist ar, page = 1, page_size = Author.default_resource_picture_page_size
+    ResourcePicture.where(self.himlist_where(ar)).includes(ResourcePicture.list_opt).order('resource_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  end
+  
+  def self.list_paginate page = 1, page_size = self.default_page_size
+    Kaminari.paginate_array(Array.new(ResourcePicture.count, nil)).page(page).per(page_size)
+  end
+  
+  def self.mylist_paginate ar, page = 1, page_size = Author.default_resource_picture_page_size
+    Kaminari.paginate_array(Array.new(ResourcePicture.where(self.mylist_where(ar)).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.himlist_paginate ar, page = 1, page_size = Author.default_resource_picture_page_size
+    Kaminari.paginate_array(Array.new(ResourcePicture.where(self.himlist_where(ar)).count, nil)).page(page).per(page_size)
   end
   
   def self.list_opt
-    {:include => {:license => {}, :artist => {}, :picture => {}} }
+    {:license => {}, :artist => {}, :picture => {} }
   end
   
   def self.list_json_opt
     {:include => {:license => {}, :artist => {}, :picture => {}} }
   end
   
-  def self.mylist ar, page = 1, page_size = Author.default_resource_picture_page_size
-    opt = {}
-    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)
-  end
-  
   def self.show rid, roles
     opt = {}
     opt.merge!(self.show_opt)