diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index bc02d29ce..a16eede4e 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -77,7 +77,7 @@ class Setting < ActiveRecord::Base cattr_accessor :available_settings self.available_settings ||= {} - validates_uniqueness_of :name + validates_uniqueness_of :name, :if => Proc.new {|setting| setting.new_record? || setting.name_changed?} validates_inclusion_of :name, :in => Proc.new {available_settings.keys} validates_numericality_of :value, :only_integer => true, :if => Proc.new { |setting| (s = available_settings[setting.name]) && s['format'] == 'int' |