summaryrefslogtreecommitdiffstats
path: root/app/models/custom_field.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-31 13:12:34 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-08-31 13:12:34 +0000
commit545c4fa6c91eb283f430ebc7ba0b2ebadc873491 (patch)
tree033720f4d3445391c3e221faf60daa0ee7d3cb26 /app/models/custom_field.rb
parentdbc616c928bc06358190a78689f901a0c9f9b9c4 (diff)
downloadredmine-545c4fa6c91eb283f430ebc7ba0b2ebadc873491.tar.gz
redmine-545c4fa6c91eb283f430ebc7ba0b2ebadc873491.zip
Rails3: replace deprecated 'validate' method at CustomField model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6912 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/custom_field.rb')
-rw-r--r--app/models/custom_field.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index b8cea995e..8135378a5 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -25,6 +25,8 @@ class CustomField < ActiveRecord::Base
validates_length_of :name, :maximum => 30
validates_inclusion_of :field_format, :in => Redmine::CustomFieldFormat.available_formats
+ validate :validate_values
+
def initialize(attributes = nil)
super
self.possible_values ||= []
@@ -36,7 +38,7 @@ class CustomField < ActiveRecord::Base
true
end
- def validate
+ def validate_values
if self.field_format == "list"
errors.add(:possible_values, :blank) if self.possible_values.nil? || self.possible_values.empty?
errors.add(:possible_values, :invalid) unless self.possible_values.is_a? Array