X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Flicense_group.rb;h=084906560fd53d26442b22d6dcc417f7bd9fe2c7;hb=b8bd6a66f23bb46aae1e57da1eb6899a75240994;hp=fa67c7b812a15ac4ac25ea76e861a16b51337c34;hpb=e5489fabe79c2e0c28a61e7af03162e9f8b4bdfe;p=pettanr%2Fpettanr.git

diff --git a/app/models/license_group.rb b/app/models/license_group.rb
index fa67c7b8..08490656 100644
--- a/app/models/license_group.rb
+++ b/app/models/license_group.rb
@@ -1,11 +1,22 @@
 #ライセンスグループ
-class LicenseGroup < ActiveRecord::Base
+class LicenseGroup < Peta::Template
+  load_manifest
   has_many :licenses
   
   validates :name, :presence => true, :length => {:maximum => 50}, :uniqueness => true
-  validates :classname, :presence => true, :length => {:maximum => 50}
+  validates :module_name, :presence => true, :length => {:maximum => 50}
   validates :caption, :presence => true, :length => {:maximum => 30}
-  validates :url, :presence => true, :length => {:maximum => 200}, :url => true
+  validates :url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
+  
+  def supply_default
+  end
+  
+  def overwrite
+  end
+  
+  def self.show_opt
+    {:include => {:licenses => {}}}
+  end
   
   def self.store name, attr
     #ライセンスデータがあるとライセンスグループのデータ生成で邪魔するので移しておく
@@ -16,7 +27,7 @@ class LicenseGroup < ActiveRecord::Base
     r.save
     #取っておいたライセンスデータとidでライセンス作成
     if (c = License.stores(lattr, r.id)) > 0
-      r.errors.add :base, 'licenses can not create'
+      r.errors.add :base, License.model_name.human + I18n.t('errors.not_create')
     end
     r
   end
@@ -25,34 +36,15 @@ class LicenseGroup < ActiveRecord::Base
     LicenseGroup.import_file(filename) {|name, attr| LicenseGroup.store(name, attr)}
   end
   
-  def self.list opt = {}
-    opt.merge!(self.list_opt) unless opt[:include]
-    opt.merge!({:order => 'license_groups.name asc'})
-    LicenseGroup.find(:all, opt)
-  end
-  
-  def self.list_opt
-    {:include => {:licenses => {}}}
-  end
-  
-  def self.list_json_opt
-    {:include => {:licenses => {}}}
-  end
-  
-  def self.show rid, opt = {}
-    r = LicenseGroup.find(rid, :include => self.show_include_opt(opt))
-#    raise ActiveRecord::Forbidden unless c.visible?(au)
-    r
-  end
-  
-  def self.show_include_opt opt = {}
-    res = {:licenses => {}}
-    res.push(opt[:include]) if opt[:include]
-    res
-  end
-  
-  def self.show_json_include_opt
-    {:include => {:licenses => {}}}
+  def self.disp_import_error r
+    if r == false
+      puts "json file error. file does not exist or broken"
+    else
+      unless r.empty?
+        r.each do |lg|
+          put lg.errors.full_messages
+        end
+      end
+    end
   end
-  
 end