Moved build_query_from_params helper to Query#build_from_params.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10966 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2012-12-09 15:11:00 +00:00
parent eb1829e739
commit 10998c9bae
3 changed files with 19 additions and 17 deletions
+15
View File
@@ -158,6 +158,21 @@ class Query < ActiveRecord::Base
@is_for_all = project.nil?
end
# Builds the query from the given params
def build_from_params(params)
if params[:fields] || params[:f]
self.filters = {}
add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v])
else
available_filters.keys.each do |field|
add_short_filter(field, params[field]) if params[field]
end
end
self.group_by = params[:group_by] || (params[:query] && params[:query][:group_by])
self.column_names = params[:c] || (params[:query] && params[:query][:column_names])
self
end
def validate_query_filters
filters.each_key do |field|
if values_for(field)