X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Foriginal_picture.rb;h=759da1dfc691c9efa1f9ca78741dfe76d14536e9;hb=63ecce87bad492d32f35eff334989bf2c1b60f64;hp=32156279eecd2379964a0e8b6d19a9fa8239a2f9;hpb=623fb328302e8daec437b33f9511cdb491cbc203;p=pettanr%2Fpettanr.git

diff --git a/app/models/original_picture.rb b/app/models/original_picture.rb
index 32156279..759da1df 100644
--- a/app/models/original_picture.rb
+++ b/app/models/original_picture.rb
@@ -1,4 +1,5 @@
 class OriginalPicture < Peta::Content
+  load_manifest
   belongs_to :artist
   belongs_to :original_picture_license_group
   has_one :resource_picture
@@ -11,11 +12,8 @@ class OriginalPicture < Peta::Content
   validates :artist_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :md5, :presence => true, :length => {:minimum => 32, :maximum => 32}
   
-  def self.owner_type
-    :artist
-  end
-  
   def supply_default
+    self.artist_id = nil
   end
   
   def overwrite operators
@@ -75,18 +73,6 @@ class OriginalPicture < Peta::Content
     self.published_at != nil
   end
   
-  def self.list_order
-    'original_pictures.updated_at desc'
-  end
-  
-  def self.list_opt
-    {:resource_picture => {}, :pictures => {} }
-  end
-  
-  def self.list_json_opt
-    {:include => {:resource_picture => {}, :pictures => {}}}
-  end
-  
   def history 
     Picture.find(:all, {:conditions => ['pictures.original_picture_id = ?', self.id], :order => 'pictures.revision desc'} )
   end
@@ -95,10 +81,6 @@ class OriginalPicture < Peta::Content
     {:include => {:resource_picture => {}, :pictures => {}}}
   end
   
-  def self.show_json_opt
-    {:include => {:resource_picture => {}, :pictures => {}}}
-  end
-  
   def store(imager)
     unless imager
       self.errors.add :base, I18n.t('errors.invalid_image')
@@ -173,7 +155,7 @@ class OriginalPicture < Peta::Content
     lg = l.license_group
     attr[:license_id] = l.id
     
-    ctl = lg.classname.pluralize + '::Attribute'
+    ctl = lg.module_name.pluralize + '::Attribute'
     le = ctl.constantize.new attr
     
     rp = ResourcePicture.new