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

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

diff --git a/app/models/license.rb b/app/models/license.rb
index 6607b20..ab72aab 100644 (file)
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -9,6 +9,15 @@ class License < ActiveRecord::Base
   validates :url, :presence => true, :length => {:maximum => 200}, :uniqueness => true, :url => {:message => I18n.t('errors.messages.url')} #{:allow_blank => true}
   validates :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   
+  before_validation :valid_encode
+  
+  def valid_encode
+    ['name', 'caption', 'url', 'settings', 'credit_pictures'].each do |a|
+      next if attributes[a] == nil
+      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
+    end
+  end
+  
   def supply_default
   end