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

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

diff --git a/app/models/license_group.rb b/app/models/license_group.rb
index 65079dd..cbd6fc1 100644 (file)
--- a/app/models/license_group.rb
+++ b/app/models/license_group.rb
@@ -1,5 +1,6 @@
 #ライセンスグループ
-class LicenseGroup < ActiveRecord::Base
+class LicenseGroup < Peta::SystemResource
+  load_manifest
   has_many :licenses
   
   validates :name, :presence => true, :length => {:maximum => 50}, :uniqueness => true
@@ -7,26 +8,18 @@ class LicenseGroup < ActiveRecord::Base
   validates :caption, :presence => true, :length => {:maximum => 30}
   validates :url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
   
-  before_validation :valid_encode
-  
-  def valid_encode
-    ['name', 'classname', 'caption', 'url'].each do |a|
-      next if attributes[a] == nil
-      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
-    end
-  end
-  
   def supply_default
   end
   
   def overwrite
   end
   
-  def self.list
-    opt = {}
-    opt.merge!(self.list_opt)
-    opt.merge!({:order => 'license_groups.name asc'})
-    LicenseGroup.find(:all, opt)
+  def self.list_where
+    ''
+  end
+  
+  def self.list_order
+    'license_groups.name asc'
   end
   
   def self.list_opt
@@ -37,14 +30,6 @@ class LicenseGroup < ActiveRecord::Base
     {:include => {:licenses => {}}}
   end
   
-  def self.show rid
-    opt = {}
-    opt.merge!(self.show_opt)
-    res = LicenseGroup.find(rid, opt)
-#    raise ActiveRecord::Forbidden unless res.visible?(au)
-    res
-  end
-  
   def self.show_opt
     {:include => {:licenses => {}}}
   end