temp

[pettanr/pettanr.git] / lib / content.rb

diff --git a/lib/content.rb b/lib/content.rb
index 83f00ac..9f34832 100644 (file)
--- a/lib/content.rb
+++ b/lib/content.rb
@@ -10,7 +10,7 @@ class Pettanr::Content < Pettanr::Item
     ''
   end
   
-  def self.himlist_where anybody
+  def self.himlist_where anyone
     ''
   end
   
@@ -22,8 +22,13 @@ class Pettanr::Content < Pettanr::Item
     self.where(self.mylist_where(me)).includes(self.list_opt).order(self.mylist_order).offset((page -1) * page_size).limit(page_size)
   end
   
-  def self.himlist anybody, page = 1, page_size = self.default_page_size
-    self.where(self.himlist_where(anybody)).includes(self.list_opt).order(self.mylist_order).offset((page -1) * page_size).limit(page_size)
+  def self.himlist anyone, operators, page = 1, page_size = self.default_page_size
+    where_str = if operators.admin?
+      self.list_where
+    else
+      self.himlist_where(anyone)
+    end
+    self.where(where_str).includes(self.list_opt).order(self.mylist_order).offset((page -1) * page_size).limit(page_size)
   end
   
   def self.mylist_paginate me, page = 1, page_size = self.default_page_size
@@ -32,9 +37,14 @@ class Pettanr::Content < Pettanr::Item
     ).includes(self.list_opt).count, nil)).page(page).per(page_size)
   end
   
-  def self.himlist_paginate anybody, page = 1, page_size = self.default_page_size
+  def self.himlist_paginate anyone, operators, page = 1, page_size = self.default_page_size
+    where_str = if operators.admin?
+      self.list_where
+    else
+      self.himlist_where(anyone)
+    end
     Kaminari.paginate_array(
-      Array.new(self.where(self.himlist_where(anybody)
+      Array.new(self.where(where_str)
     ).includes(self.list_opt).count, nil)).page(page).per(page_size)
   end