diff app/helpers/.svn/text-base/queries_helper.rb.svn-base @ 41:7f0e922c8982 luisf

merged with new version from trunk
author luisf
date Fri, 19 Nov 2010 14:45:28 +0000
parents 94944d00e43c
children cbce1fd3b1b7
line wrap: on
line diff
--- a/app/helpers/.svn/text-base/queries_helper.rb.svn-base	Thu Nov 18 17:50:11 2010 +0000
+++ b/app/helpers/.svn/text-base/queries_helper.rb.svn-base	Fri Nov 19 14:45:28 2010 +0000
@@ -78,10 +78,9 @@
         # Give it a name, required to be valid
         @query = Query.new(:name => "_")
         @query.project = @project
-        if params[:fields] and params[:fields].is_a? Array
-          params[:fields].each do |field|
-            @query.add_filter(field, params[:operators][field], params[:values][field])
-          end
+        if params[:fields]
+          @query.filters = {}
+          @query.add_filters(params[:fields], params[:operators], params[:values])
         else
           @query.available_filters.keys.each do |field|
             @query.add_short_filter(field, params[field]) if params[field]