t#31470:create pager

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

diff --git a/app/models/original_picture.rb b/app/models/original_picture.rb
index 2415578..28bf7b6 100644 (file)
--- a/app/models/original_picture.rb
+++ b/app/models/original_picture.rb
@@ -91,26 +91,30 @@ class OriginalPicture < ActiveRecord::Base
     page_size
   end
   
-  def self.mylist artist_id, 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!({:conditions => ['original_pictures.artist_id = ?', artist_id], :order => 'original_pictures.updated_at desc'})
-    OriginalPicture.find(:all, opt)
+  def self.mylist_where ar
+    ['original_pictures.artist_id = ?', ar.id]
   end
   
-  def history 
-    Picture.find(:all, {:conditions => ['pictures.original_picture_id = ?', self.id], :order => 'pictures.revision desc'} )
+  def self.mylist ar, page = 1, page_size = self.default_page_size
+    OriginalPicture.where(self.mylist_where(ar)).includes(OriginalPicture.list_opt).order('original_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  end
+  
+  def self.mylist_paginate ar, page = 1, page_size = self.default_page_size
+    Kaminari.paginate_array(Array.new(OriginalPicture.where(self.mylist_where(ar)).count, nil)).page(page).per(page_size)
   end
   
   def self.list_opt
-    {:include => {:resource_picture => {}, :pictures => {}}}
+    {:resource_picture => {}, :pictures => {} }
   end
   
   def self.list_json_opt
     {:include => {:resource_picture => {}, :pictures => {}}}
   end
   
+  def history 
+    Picture.find(:all, {:conditions => ['pictures.original_picture_id = ?', self.id], :order => 'pictures.revision desc'} )
+  end
+  
   def self.show cid, roles
     opt = {}
     opt.merge!(self.show_opt)