fix profiler extend system

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

diff --git a/app/models/license.rb b/app/models/license.rb
index c21e592..abb7c2c 100644 (file)
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -9,7 +9,7 @@ class License < Peta::SystemResource
   validates :license_group_classname, :presence => true, :length => {:maximum => 50}
   validates :name, :presence => true, :length => {:maximum => 50}
   validates :caption, :presence => true, :length => {:maximum => 30}
-  validates :url, :presence => true, :length => {:maximum => 200}, :uniqueness => true, :url => {:message => I18n.t('errors.messages.url')} #{:allow_blank => true}
+  validates :url, :presence => true, :length => {:maximum => 200}, :uniqueness => {:scope => :name}, :url => {:message => I18n.t('errors.messages.url')} #{:allow_blank => true}
   validates :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   
   def supply_default
@@ -52,7 +52,8 @@ class License < Peta::SystemResource
   
   def self.store name, attr
     r = License.replace_system_picture attr
-    attr['credit_pictures'] = attr['credit_pictures'].to_json
+    attr['credit_picture_settings'] = attr['credit_picture_settings'].to_json
+    attr['license_group_settings'] = attr['license_group_settings'].to_json
     l = License.modify_object name, attr
     if r == false
       l.errors.add :base, SystemPicture.model_name.human + I18n.t('errors.not_create')