diff options
| author | Etienne Massip <etienne.massip@gmail.com> | 2011-10-18 21:19:58 +0000 |
|---|---|---|
| committer | Etienne Massip <etienne.massip@gmail.com> | 2011-10-18 21:19:58 +0000 |
| commit | 4eed0dca1544ccbb89fd50b34d7bb4bc2ac726c5 (patch) | |
| tree | b8594b34e58eca41d3cbd2e0d26af8301e2fe48a /app/models/query.rb | |
| parent | 33f65c5a48451f481d592239e6fe1b6c89596b03 (diff) | |
| download | redmine-4eed0dca1544ccbb89fd50b34d7bb4bc2ac726c5.tar.gz redmine-4eed0dca1544ccbb89fd50b34d7bb4bc2ac726c5.zip | |
Reverted r7628.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7629 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/query.rb')
| -rw-r--r-- | app/models/query.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 411bef19f..9eac4b81c 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -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 |