From 3b6ba58b112e6d4026f17a43d8dd17a469d48ec8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 5 Dec 2014 15:02:29 +0000 Subject: Skip uniqueness validation when updating a setting without changing its name. git-svn-id: http://svn.redmine.org/redmine/trunk@13720 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/setting.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') 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' -- cgit v1.2.3