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

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

diff --git a/app/models/original_picture.rb b/app/models/original_picture.rb
index 2415578..020bc56 100644 (file)
--- a/app/models/original_picture.rb
+++ b/app/models/original_picture.rb
@@ -1,4 +1,5 @@
-class OriginalPicture < ActiveRecord::Base
+class OriginalPicture < Peta::Content
+  load_manifest
   belongs_to :artist
   belongs_to :original_picture_license_group
   has_one :resource_picture
@@ -14,23 +15,15 @@ class OriginalPicture < ActiveRecord::Base
   def supply_default
   end
   
-  def overwrite ar
+  def overwrite operators
     self.uploaded_at = Time.now
-    self.artist_id = ar.id
+    return unless operators.artist
+    self.artist_id = operators.artist.id
   end
   
-  def own? roles
-    roles = [roles] unless roles.respond_to?(:each)
-    ar = OriginalPicture.get_artist_from_roles roles
-    return false unless ar
-    self.artist_id == ar.id
+  def visible? operators
+    self.own? operators
   end
-  
-  def visible? roles
-    return true if self.admin_role_check roles
-    self.own?(roles)
-  end
-  
   def filename
     "#{self.id}.#{self.ext}"
   end
@@ -52,6 +45,15 @@ class OriginalPicture < ActiveRecord::Base
     {:src => self.url, :width => tw, :height => th}
   end
   
+  def symbol_option
+    self.tmb_opt_img_tag
+  end
+  
+  def revision
+    head = self.history.first
+    head ? head.revision : 'unpublished'
+  end
+  
   def unpublished?
     self.published_at == nil and self.stopped_at == nil
   end
@@ -70,61 +72,20 @@ class OriginalPicture < ActiveRecord::Base
     self.published_at != nil
   end
   
-  def self.default_page_size
-    25
-  end
-  
-  def self.max_page_size
-    100
-  end
-  
-  def self.page prm = nil
-    page = prm.to_i
-    page = 1 if page < 1
-    page
-  end
-  
-  def self.page_size prm = self.default_page_size
-    page_size = prm.to_i
-    page_size = self.max_page_size if page_size > self.max_page_size
-    page_size = self.default_page_size if page_size < 1
-    page_size
-  end
-  
-  def self.mylist artist_id, 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 => ['original_pictures.artist_id = ?', artist_id], :order => 'original_pictures.updated_at desc'})
-    OriginalPicture.find(:all, opt)
-  end
-  
-  def history 
-    Picture.find(:all, {:conditions => ['pictures.original_picture_id = ?', self.id], :order => 'pictures.revision desc'} )
+  def self.list_order
+    'original_pictures.updated_at desc'
   end
   
   def self.list_opt
-    {:include => {:resource_picture => {}, :pictures => {}}}
+    {:resource_picture => {}, :pictures => {} }
   end
   
   def self.list_json_opt
     {:include => {:resource_picture => {}, :pictures => {}}}
   end
   
-  def self.show cid, roles
-    opt = {}
-    opt.merge!(self.show_opt)
-    res = OriginalPicture.find(cid, opt)
-    raise ActiveRecord::Forbidden unless res.visible?(roles)
-    res
-  end
-  
-  def self.edit cid, ar
-    opt = {}
-    opt.merge!(self.show_opt)
-    res = OriginalPicture.find(cid, opt)
-    raise ActiveRecord::Forbidden unless res.own?(ar)
-    res
+  def history 
+    Picture.find(:all, {:conditions => ['pictures.original_picture_id = ?', self.id], :order => 'pictures.revision desc'} )
   end
   
   def self.show_opt