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 188b7a2..65079dd 100644 (file)
--- a/app/models/license_group.rb
+++ b/app/models/license_group.rb
@@ -5,7 +5,16 @@ class LicenseGroup < ActiveRecord::Base
   validates :name, :presence => true, :length => {:maximum => 50}, :uniqueness => true
   validates :classname, :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')}
+  
+  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
@@ -53,7 +62,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