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 2387347..cbd6fc1 100644 (file)
--- a/app/models/license_group.rb
+++ b/app/models/license_group.rb
@@ -1,5 +1,6 @@
 #ライセンスグループ
-class LicenseGroup < Pettanr::Item
+class LicenseGroup < Peta::SystemResource
+  load_manifest
   has_many :licenses
   
   validates :name, :presence => true, :length => {:maximum => 50}, :uniqueness => true
@@ -7,10 +8,6 @@ class LicenseGroup < Pettanr::Item
   validates :caption, :presence => true, :length => {:maximum => 30}
   validates :url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
   
-  def self.valid_encode_columns
-    super + ['name', 'classname', 'caption', 'url']
-  end
-  
   def supply_default
   end
   
@@ -25,12 +22,6 @@ class LicenseGroup < Pettanr::Item
     'license_groups.name asc'
   end
   
-  def self.enable_list
-    LicenseGroup.find(:all).delete_if {|lg|
-      lg.enable? == false
-    }
-  end
-  
   def self.list_opt
     {:include => {:licenses => {}}}
   end
@@ -47,21 +38,6 @@ class LicenseGroup < Pettanr::Item
     {:include => {:licenses => {}}}
   end
   
-  def engine_name
-    Pettanr::Application.manifest.system_resources.license_groups[self.classname]
-  end
-  
-  def enable?
-    Pettanr::Application.manifest.system_resources.license_groups.include? self.classname
-  end
-  
-  def engine_module_name
-    self.engine_name.camelize
-  end
-  
-  def engine
-    Object.const_get self.engine_module_name
-  end
   def self.store name, attr
     #ライセンスデータがあるとライセンスグループのデータ生成で邪魔するので移しておく
     lattr = attr["licenses_attributes"]