jro_apps/redmine Commit - r7508:33f65c5a4845

Filter out illegal values to prevent raise of PostgreSQL exceptions, restored last test part removed with r7625 (#8371)....

Etienne Massip -

r7508:33f65c5a4845

parent child

Context file:

r7508:33f65c5a4845

app/models/query.rb +6 0

                 available_filters[field][:type] if available_filters.has_key?(field)
               end
+              def allowed_values_for(field)
+                available_filters[field][:values] if available_filters.has_key?(field)
+              end
               def operator_for(field)
                 has_filter?(field) ? filters[field][:operator] : nil
               end
                 sql = ''
                 case operator
                 when "="
+                  value &= allowed_values_for(field).collect {|val| val[1]} if value.present? && allowed_values_for(field).present?
                   if value.any?
                     case type_for(field)
                     when :date, :date_past
                     sql = "1=0"
                   end
                 when "!"
+                  value &= allowed_values_for(field).collect {|val| val[1]} if value.present? && allowed_values_for(field).present?
                   if value.any?
                     sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                   else

test/functional/issues_controller_test.rb +3 -1

                     '!~This is part of a subject' => { :op => '!~', :values => ['This is part of a subject'] }},
                   'tracker_id' => {
                     '3' => { :op => '=', :values => ['3'] },
-                    '=3' => { :op => '=', :values => ['3'] }},
+                    '=3' => { :op => '=', :values => ['3'] },
+                    '*' => { :op => '=', :values => ['*'] },
+                    '!*' => { :op => '!', :values => ['*'] }},
                   'start_date' => {
                     '2011-10-12' => { :op => '=', :values => ['2011-10-12'] },
                     '=2011-10-12' => { :op => '=', :values => ['2011-10-12'] },

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