kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Keep invalid values and add validation error message. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6229 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2011-07-10 18:34:49 +00:00
parent bedbb166b7
commit c25a79a61b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/query.rb
View File

@ -170,6 +170,10 @@ class Query < ActiveRecord::Base
def validate def validate
filters.each_key do |field| filters.each_key do |field|
if type_for(field) == :integer && values_for(field)
errors.add label_for(field), :invalid if values_for(field).detect {|v| v.present? && !v.match(/^\d+(\.\d+)?$/) }
end
errors.add label_for(field), :blank unless errors.add label_for(field), :blank unless
# filter requires one or more values # filter requires one or more values
(values_for(field) and !values_for(field).first.blank?) or (values_for(field) and !values_for(field).first.blank?) or
@ -278,11 +282,7 @@ class Query < ActiveRecord::Base
# allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]}) # allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]})
# filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator # filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator
#end #end
values ||= [''] filters[field] = {:operator => operator, :values => (values || [''])}
if filter_options[:type] == :integer
values = values.select {|v| v.blank? || v.match(/^\d+(\.\d+)?$/) }
end
filters[field] = {:operator => operator, :values => values }
end end
end end

1
test/unit/query_test.rb
View File

@ -106,7 +106,6 @@ class QueryTest < ActiveSupport::TestCase
query.add_filter('estimated_hours', '=', ['a']) query.add_filter('estimated_hours', '=', ['a'])
assert query.has_filter?('estimated_hours') assert query.has_filter?('estimated_hours')
assert query.values_for('estimated_hours').empty?
assert !query.valid? assert !query.valid?
end end