| @@ -71,6 +71,7 module QueriesHelper | |||||
| 71 | cond << " OR project_id = #{@project.id}" if @project |
|
71 | cond << " OR project_id = #{@project.id}" if @project | |
| 72 | @query = Query.find(params[:query_id], :conditions => cond) |
|
72 | @query = Query.find(params[:query_id], :conditions => cond) | |
| 73 | raise ::Unauthorized unless @query.visible? |
|
73 | raise ::Unauthorized unless @query.visible? | |
|
|
74 | @query.project = @project | |||
| 74 | session[:query] = {:id => @query.id, :project_id => @query.project_id} |
|
75 | session[:query] = {:id => @query.id, :project_id => @query.project_id} | |
| 75 | sort_clear |
|
76 | sort_clear | |
| 76 | elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) |
|
77 | elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) | |
| @@ -82,10 +83,10 module QueriesHelper | |||||
| 82 | else |
|
83 | else | |
| 83 | # retrieve from session |
|
84 | # retrieve from session | |
| 84 | @query = Query.find_by_id(session[:query][:id]) if session[:query][:id] |
|
85 | @query = Query.find_by_id(session[:query][:id]) if session[:query][:id] | |
| 85 |
@query ||= Query.new(:name => "_", :project |
|
86 | @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names]) | |
| 86 | end |
|
87 | end | |
| 87 | end |
|
88 | end | |
| 88 |
|
89 | |||
| 89 | def build_query_from_params |
|
90 | def build_query_from_params | |
| 90 | if params[:fields] || params[:f] |
|
91 | if params[:fields] || params[:f] | |
| 91 | @query.filters = {} |
|
92 | @query.filters = {} | |
General Comments 0
You need to be logged in to leave comments.
Login now