dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted r7628.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7629 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Etienne Massip
2011-10-18 21:19:58 +00:00
parent 33f65c5a48
commit 4eed0dca15
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/query.rb
-6
View File
@@ -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