##// END OF EJS Templates
Rails3: replace deprecated 'validate' method at CustomField model....
Toshi MARUYAMA -
r6792:545c4fa6c91e
parent child
Show More
@@ -25,6 +25,8 class CustomField < ActiveRecord::Base
25 validates_length_of :name, :maximum => 30
25 validates_length_of :name, :maximum => 30
26 validates_inclusion_of :field_format, :in => Redmine::CustomFieldFormat.available_formats
26 validates_inclusion_of :field_format, :in => Redmine::CustomFieldFormat.available_formats
27
27
28 validate :validate_values
29
28 def initialize(attributes = nil)
30 def initialize(attributes = nil)
29 super
31 super
30 self.possible_values ||= []
32 self.possible_values ||= []
@@ -36,7 +38,7 class CustomField < ActiveRecord::Base
36 true
38 true
37 end
39 end
38
40
39 def validate
41 def validate_values
40 if self.field_format == "list"
42 if self.field_format == "list"
41 errors.add(:possible_values, :blank) if self.possible_values.nil? || self.possible_values.empty?
43 errors.add(:possible_values, :blank) if self.possible_values.nil? || self.possible_values.empty?
42 errors.add(:possible_values, :invalid) unless self.possible_values.is_a? Array
44 errors.add(:possible_values, :invalid) unless self.possible_values.is_a? Array
General Comments 0
You need to be logged in to leave comments. Login now