Commit 663fa990 authored by emassip's avatar emassip

Reverted r7628.

git-svn-id: https://svn.redmine.org/redmine/trunk@7629 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent a3d2edcb
......@@ -333,10 +333,6 @@ class Query < ActiveRecord::Base
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
......@@ -653,7 +649,6 @@ class Query < ActiveRecord::Base
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
......@@ -670,7 +665,6 @@ class Query < ActiveRecord::Base
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
......
......@@ -162,9 +162,7 @@ class IssuesControllerTest < ActionController::TestCase
'!~This is part of a subject' => { :op => '!~', :values => ['This is part of a subject'] }},
'tracker_id' => {
'3' => { :op => '=', :values => ['3'] },
'=3' => { :op => '=', :values => ['3'] },
'*' => { :op => '=', :values => ['*'] },
'!*' => { :op => '!', :values => ['*'] }},
'=3' => { :op => '=', :values => ['3'] }},
'start_date' => {
'2011-10-12' => { :op => '=', :values => ['2011-10-12'] },
'=2011-10-12' => { :op => '=', :values => ['2011-10-12'] },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment