diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-29 21:18:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-29 21:18:35 +0000 |
| commit | 23974fb0cede44d69db1c31ef7cd7296bdb2bc90 (patch) | |
| tree | 59f80323d0c593c246d9ffad6d52d52a4c064991 /app/models/setting.rb | |
| parent | 088ab2e68689bd63a28b1caee277739a8b923c91 (diff) | |
| download | redmine-23974fb0cede44d69db1c31ef7cd7296bdb2bc90.tar.gz redmine-23974fb0cede44d69db1c31ef7cd7296bdb2bc90.zip | |
Fixed that validating a Setting with invalid name triggers an error (#15551).
git-svn-id: http://svn.redmine.org/redmine/trunk@12348 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/setting.rb')
| -rw-r--r-- | app/models/setting.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/setting.rb b/app/models/setting.rb index 444f45e20..b7a2a9b32 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -83,7 +83,9 @@ class Setting < ActiveRecord::Base validates_uniqueness_of :name validates_inclusion_of :name, :in => @@available_settings.keys - validates_numericality_of :value, :only_integer => true, :if => Proc.new { |setting| @@available_settings[setting.name]['format'] == 'int' } + validates_numericality_of :value, :only_integer => true, :if => Proc.new { |setting| + (s = @@available_settings[setting.name]) && s['format'] == 'int' + } # Hash used to cache setting values @cached_settings = {} |