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

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

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index c8dac50..34c3a40 100644 (file)
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -1,9 +1,8 @@
 #素材
-class ResourcePicture < ActiveRecord::Base
+class ResourcePicture < Pettanr::Content
   belongs_to :artist
   belongs_to :license
   belongs_to :picture
-  has_many :panel_pictures
   belongs_to :original_picture
   
   validates :ext, :presence => true, :length => {:maximum => 4}, :inclusion => {:in => ['png', 'jpeg', 'gif']}
@@ -18,6 +17,14 @@ class ResourcePicture < ActiveRecord::Base
   validates :classname, :presence => true, :length => {:maximum => 50}
   validates :picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   
+  def self.owner_type
+    :artist
+  end
+  
+  def self.valid_encode_columns
+    super + ['artist_name', 'classname', 'credit', 'settings']
+  end
+  
   def supply_default
   end
   
@@ -28,19 +35,8 @@ class ResourcePicture < ActiveRecord::Base
     self.attributes = attr
   end
   
-  def own? roles
-    roles = [roles] unless roles.respond_to?(:each)
-    ar = ResourcePicture.get_artist_from_roles roles
-    return false unless ar
-    self.artist_id == ar.id
-  end
-  
-  def visible? roles
-    if MagicNumber['run_mode'] == 0
-      return false unless guest_role_check(roles)
-    else
-      return false unless resource_reader_role_check(roles)
-    end
+  def visible? operators
+    return false unless super
     true
   end
   
@@ -78,59 +74,26 @@ class ResourcePicture < ActiveRecord::Base
     {:src => self.url('full'), :width => self.width, :height => self.height}
   end
   
-  def self.default_page_size
-    25
-  end
-  
-  def self.max_page_size
-    100
+  def symbol_option
+    self.tmb_opt_img_tag
   end
   
-  def self.page prm = nil
-    page = prm.to_i
-    page = 1 if page < 1
-    page
+  def self.list_order
+    'resource_pictures.updated_at desc'
   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.list 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!({:order => 'updated_at desc'})
-    ResourcePicture.find(:all, opt)
+  def self.list_where
+    ''
   end
   
   def self.list_opt
-    {:include => {:license => {}, :artist => {}, :picture => {}} }
+    {:license => {}, :artist => {}, :picture => {} }
   end
   
   def self.list_json_opt
     {:include => {:license => {}, :artist => {}, :picture => {}} }
   end
   
-  def self.mylist ar, page = 1, page_size = Author.default_resource_picture_page_size
-    opt = {}
-    opt.merge!(ResourcePicture.list_opt)
-    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
-    opt.merge!({:conditions => ['resource_pictures.artist_id = ?', ar.id], :order => 'resource_pictures.updated_at desc'})
-    ResourcePicture.find(:all, opt)
-  end
-  
-  def self.show rid, roles
-    opt = {}
-    opt.merge!(self.show_opt)
-    r = ResourcePicture.find(rid, opt)
-    raise ActiveRecord::Forbidden unless r.visible?(roles)
-    r
-  end
-  
   def self.show_opt
     {:include => {:license => {}, :artist => {}, :picture => {}} }
   end
@@ -139,14 +102,6 @@ class ResourcePicture < ActiveRecord::Base
     {:include => {:license => {}, :artist => {}, :picture => {}} }
   end
   
-  def self.edit rid, ar
-    opt = {}
-    opt.merge!(self.show_opt)
-    r = ResourcePicture.find(rid, opt)
-    raise ActiveRecord::Forbidden unless r.own?(ar)
-    r
-  end
-  
   def new_picture imager
     pc = Picture.new
     pc.supply_default