X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fscroll_panel.rb;h=dbc4de2ca2dc8448a8d16d0fdf6f2edbeadffb6f;hb=HEAD;hp=9ce35bbaf992f668d24be3545d1f18d600c468e5;hpb=6945f99e15e7ac499dc52e7af30fbff1499a6e78;p=pettanr%2Fpettanr.git

diff --git a/app/models/scroll_panel.rb b/app/models/scroll_panel.rb
index 9ce35bba..dbc4de2c 100644
--- a/app/models/scroll_panel.rb
+++ b/app/models/scroll_panel.rb
@@ -6,9 +6,44 @@ class ScrollPanel < Peta::Leaf
   
   validates :scroll_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :panel_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
+  scope :with_scroll, -> do
+    includes(:scroll)
+  end
+  
+  scope :find_index, -> do
+    with_scroll.where(Scroll.arel_table[:visible].gt 0).references(:scroll)
+  end
+  
+  scope :find_private, -> (operators) do 
+    with_scroll.where(Scroll.arel_table[:author_id].eq operators.author.id).references(:scroll)
+  end
+  
+  scope :by_scroll, -> (scroll_id) do 
+    where(scroll_id: scroll_id)
+  end
+  
+  scope :find_by_scroll, -> (scroll_id) do 
+    find_index.by_scroll(scroll_id).references(:scroll)
+  end
+  
+  scope :find_by_panel, -> (panel_id) do 
+    find_index.where(panel_id: panel_id).references(:scroll)
+  end
+  
+  scope :find_by_author, -> (author_id) do 
+    find_index.where(Scroll.arel_table[:author_id].eq author_id).references(:scroll)
+  end
+  
+  scope :find_play, -> (scroll_id) do 
+    find_by_scroll(scroll_id)
+  end
+  
+  scope :find_private_play, -> (scroll_id, operators) do 
+    find_private(operators).by_scroll(scroll_id)
+  end
+  
   def supply_default
     self.scroll_id = nil
     self.panel_id = nil
@@ -16,29 +51,21 @@ class ScrollPanel < Peta::Leaf
   end
   
   def overwrite operators
-    return false unless operators.author
-    self.author_id = operators.author.id
   end
   
-  def self.public_list_order
-    'scroll_panels.updated_at desc'
+  def self.public_list_where list
+    'scrolls.visible > 0'
   end
   
-  def self.public_list_where
-    'scrolls.visible > 0'
+  def self.by_author_list_includes
+    [:scroll => :author]
   end
   
   def self.show_opt
     {:include => {
-      :author => {}, 
       :scroll => {
         :author => {}
       }, 
-      :panel => {
-        :author => {}, 
-        :panel_pictures => {:picture => {:artist => {}, :license => {}}}, 
-        :speech_balloons =>{:balloon => {}, :speech => {}}
-      }
     }}
   end