Actualiza a Redmine 3.4.13
This commit is contained in:
parent
807ff3308d
commit
ecddcaf1d3
224 changed files with 2222 additions and 1000 deletions
|
@ -486,7 +486,7 @@ module Redmine
|
|||
|
||||
def validate_single_value(custom_field, value, customized=nil)
|
||||
errs = super
|
||||
errs << ::I18n.t('activerecord.errors.messages.not_a_number') unless value.to_s =~ /^[+-]?\d+$/
|
||||
errs << ::I18n.t('activerecord.errors.messages.not_a_number') unless value.to_s.strip =~ /^[+-]?\d+$/
|
||||
errs
|
||||
end
|
||||
|
||||
|
@ -736,6 +736,16 @@ module Redmine
|
|||
options
|
||||
end
|
||||
|
||||
def validate_custom_value(custom_value)
|
||||
values = Array.wrap(custom_value.value).reject {|value| value.to_s == ''}
|
||||
invalid_values = values - possible_custom_value_options(custom_value).map(&:last)
|
||||
if invalid_values.any?
|
||||
[::I18n.t('activerecord.errors.messages.inclusion')]
|
||||
else
|
||||
[]
|
||||
end
|
||||
end
|
||||
|
||||
def order_statement(custom_field)
|
||||
if target_class.respond_to?(:fields_for_order_statement)
|
||||
target_class.fields_for_order_statement(value_join_alias(custom_field))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue