jro_apps/redmine Commit - r6109:c25a79a61b1e

Keep invalid values and add validation error message....

Jean-Philippe Lang -

r6109:c25a79a61b1e

parent child

Context file:

r6109:c25a79a61b1e

app/models/query.rb +5 -5

                def validate
                  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
                        # filter requires one or more values
                        (values_for(field) and !values_for(field).first.blank?) or
                    #  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
                    #end
-                   values ||= ['']
-                   if filter_options[:type] == :integer
-                     values = values.select {|v| v.blank? || v.match(/^\d+(\.\d+)?$/) }
-                   end
-                   filters[field] = {:operator => operator, :values => values }
+                   filters[field] = {:operator => operator, :values => (values || [''])}
                  end
                end

test/unit/query_test.rb 0 -1

                  query.add_filter('estimated_hours', '=', ['a'])
                  assert query.has_filter?('estimated_hours')
-                 assert query.values_for('estimated_hours').empty?
                  assert !query.valid?
                end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages