comparison app/helpers/queries_helper.rb @ 37:94944d00e43c

* Update to SVN trunk rev 4411
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 19 Nov 2010 13:24:41 +0000
parents 1d32c0a0efbf
children cbce1fd3b1b7
comparison
equal deleted inserted replaced
22:40f7cfd4df19 37:94944d00e43c
76 else 76 else
77 if api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) 77 if api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
78 # Give it a name, required to be valid 78 # Give it a name, required to be valid
79 @query = Query.new(:name => "_") 79 @query = Query.new(:name => "_")
80 @query.project = @project 80 @query.project = @project
81 if params[:fields] and params[:fields].is_a? Array 81 if params[:fields]
82 params[:fields].each do |field| 82 @query.filters = {}
83 @query.add_filter(field, params[:operators][field], params[:values][field]) 83 @query.add_filters(params[:fields], params[:operators], params[:values])
84 end
85 else 84 else
86 @query.available_filters.keys.each do |field| 85 @query.available_filters.keys.each do |field|
87 @query.add_short_filter(field, params[field]) if params[field] 86 @query.add_short_filter(field, params[field]) if params[field]
88 end 87 end
89 end 88 end