Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/models/panel.rb b/app/models/panel.rb
index b635a21..dc8948a 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -85,32 +85,44 @@ class Panel < ActiveRecord::Base
     page_size
   end
   
+  def self.list_where
+    'panels.publish > 0'
+  end
+  
+  def self.mylist_where au
+    ['panels.author_id = ?', au.id]
+  end
+  
+  def self.himlist_where au
+    ['panels.author_id = ? and panels.publish > 0', au.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!({:conditions => 'panels.publish > 0', :order => 'panels.updated_at desc'})
-    Panel.find(:all, opt)
+    Panel.where(self.list_where()).includes(Panel.list_opt).order('panels.updated_at desc').offset((page -1) * page_size).limit(page_size)
   end
   
   def self.mylist au, page = 1, page_size = Author.default_panel_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 => ['panels.author_id = ?', au.id], :order => 'panels.updated_at desc'})
-    Panel.find(:all, opt)
+    Panel.where(self.mylist_where(au)).includes(Panel.list_opt).order('panels.updated_at desc').offset((page -1) * page_size).limit(page_size)
   end
   
   def self.himlist au, page = 1, page_size = Author.default_panel_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 => ['panels.author_id = ? and panels.publish > 0', au.id], :order => 'panels.updated_at desc'})
-    Panel.find(:all, opt)
+    Panel.where(self.himlist_where(au)).includes(Panel.list_opt).order('panels.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(Panel.where(self.list_where()).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.mylist_paginate au, page = 1, page_size = Author.default_panel_page_size
+    Kaminari.paginate_array(Array.new(Panel.where(self.mylist_where(au)).count, nil)).page(page).per(page_size)
+  end
+  
+  def self.himlist_paginate au, page = 1, page_size = Author.default_panel_page_size
+    Kaminari.paginate_array(Array.new(Panel.where(self.himlist_where(au)).count, nil)).page(page).per(page_size)
   end
   
   def self.list_opt
-    {:include => {
+    {
       :panel_pictures => {
         :picture => {:artist => {}, :license => {}}
       }, 
@@ -121,7 +133,7 @@ class Panel < ActiveRecord::Base
       :ground_colors => {
       }, 
       :author => {}
-    }}
+    }
   end
   
   def self.show rid, roles