v07

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

diff --git a/app/models/original_picture.rb b/app/models/original_picture.rb
index 5380713..f4f4058 100644 (file)
--- a/app/models/original_picture.rb
+++ b/app/models/original_picture.rb
@@ -17,6 +17,10 @@ class OriginalPicture < Peta::Content
     where(artist_id: operators.artist.id)
   end
   
+  scope :find_history, -> (id) do 
+    Picture.find_by_original_picture(id).order(Picture.arel_table[:revision].desc)
+  end
+  
   def supply_default
     self.artist_id = nil
   end
@@ -60,7 +64,7 @@ class OriginalPicture < Peta::Content
   end
   
   def revision
-    head = self.history.first
+    head = self.class.find_history(self.id).first
     head ? head.revision : 'unpublished'
   end
   
@@ -82,10 +86,6 @@ class OriginalPicture < Peta::Content
     self.published_at != nil
   end
   
-  def history 
-    Picture.where(original_picture_id: self.id).order(revision: :desc)
-  end
-  
   def self.show_opt
     {:include => {:resource_picture => {}, :pictures => {}}}
   end