X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fmodels%2Fcomic.rb;h=738d43836039a0b154422dd9edbd9d9826887464;hp=dd19b930b2bf4b015d433c17605f44b045f36bb2;hb=e6ae2d4d0e9cec1828ef7e4bec617d7f925d8133;hpb=2bcff4ea2e955de6c21e19239313f00ac323f410

diff --git a/app/models/comic.rb b/app/models/comic.rb
index dd19b930..738d4383 100644
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -69,36 +69,48 @@ class Comic < ActiveRecord::Base
     page_size
   end
   
-  def self.list page = 1, page_size = self.default_page_size
-    opt = {}
-    opt.merge!(Comic.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => ['visible > 0'], :order => 'updated_at desc'})
-    Comic.find(:all, opt)
+  def self.list_where
+    'comics.visible > 0'
   end
   
-  def self.list_opt
-    {:include => {:stories => {:panel => {}}, :author => {}}}
+  def self.mylist_where au
+    ['comics.author_id = ?', au.id]
   end
   
-  def self.list_json_opt
-    {:include => {:stories => {:include => {:panel => {}}}, :author => {}}}
+  def self.himlist_where au
+    ['comics.author_id = ? and comics.visible > 0', au.id]
+  end
+  
+  def self.list page = 1, page_size = self.default_page_size
+    Comic.where(self.list_where()).includes(Comic.list_opt).order('comics.updated_at desc').offset((page -1) * page_size).limit(page_size)
   end
   
   def self.mylist au, page = 1, page_size = Author.default_comic_page_size
-    opt = {}
-    opt.merge!(Comic.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => ['comics.author_id = ?', au.id], :order => 'comics.updated_at desc'})
-    Comic.find(:all, opt)
+    Comic.where(self.mylist_where(au)).includes(Comic.list_opt).order('comics.updated_at desc').offset((page -1) * page_size).limit(page_size)
   end
   
   def self.himlist au, page = 1, page_size = Author.default_comic_page_size
-    opt = {}
-    opt.merge!(Comic.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => ['comics.author_id = ? and visible > 0', au.id], :order => 'comics.updated_at desc'})
-    Comic.find(:all, opt)
+    Comic.where(self.himlist_where(au)).includes(Comic.list_opt).order('comics.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(Comic.where(self.list_where()).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.mylist_paginate au, page = 1, page_size = Author.default_comic_page_size
+    Kaminari.paginate_array(Array.new(Comic.where(self.mylist_where(au)).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.himlist_paginate au, page = 1, page_size = Author.default_comic_page_size
+    Kaminari.paginate_array(Array.new(Comic.where(self.himlist_where(au)).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.list_opt
+    {:stories => {:panel => {}}, :author => {} }
+  end
+  
+  def self.list_json_opt
+    {:include => {:stories => {:include => {:panel => {}}}, :author => {}}}
   end
   
   def self.show cid, roles