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

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

diff --git a/app/models/system_picture.rb b/app/models/system_picture.rb
index a9cf03e..8a3210d 100644 (file)
--- a/app/models/system_picture.rb
+++ b/app/models/system_picture.rb
@@ -1,6 +1,7 @@
-class SystemPicture < Pettanr::Item
+class SystemPicture < Peta::Item
+  load_manifest
   has_many :balloons
-  has_many :balloon_templates
+  has_many :speech_balloon_templates
   has_many :licenses
   
   validates :ext, :presence => true, :length => {:maximum => 4}, :inclusion => {:in => ['png', 'jpeg', 'gif']}
@@ -9,18 +10,6 @@ class SystemPicture < Pettanr::Item
   validates :filesize, :presence => true, :numericality => {:greater_than => 0, :less_than_or_equal_to => 2000000}, :natural_number => true
   validates :md5, :presence => true, :length => {:minimum => 32, :maximum => 32}
   
-  def self.singular
-    'SystemPicture'
-  end
-  
-  def self.plural
-    'SystemPictures'
-  end
-  
-  def self.owner_type
-    :author
-  end
-  
   before_destroy :destroy_with_file
   
   def destroy_with_file
@@ -33,17 +22,6 @@ class SystemPicture < Pettanr::Item
   def overwrite
   end
   
-  def own? roles
-    roles = [roles] unless roles.respond_to?(:each)
-    ad = SystemPicture.get_admin_from_roles roles
-    return false unless ad
-    true
-  end
-  
-  def visible? ad
-    true
-  end
-  
   def filename
     "#{self.id}.#{self.ext}"
   end
@@ -69,37 +47,12 @@ class SystemPicture < Pettanr::Item
     self.tmb_opt_img_tag
   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.list_where
     nil
   end
   
-  def self.list page = 1, page_size = self.default_page_size
-    SystemPicture.where(self.list_where()).includes(SystemPicture.list_opt).order('system_pictures.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.list_paginate page = 1, page_size = self.default_page_size
-    Kaminari.paginate_array(Array.new(SystemPicture.where(self.list_where()).count, nil)).page(page).per(page_size)
+  def self.list_order
+    'system_pictures.updated_at desc'
   end
   
   def self.list_opt
@@ -110,14 +63,6 @@ class SystemPicture < Pettanr::Item
     {}
   end
   
-  def self.show sid, ad
-    opt = {}
-    opt.merge!(self.show_opt)
-    res = SystemPicture.find(sid, opt)
-    raise ActiveRecord::Forbidden unless res.visible?(ad)
-    res
-  end
-  
   def self.show_opt
     {}
   end