Mercurial > hg > soundsoftware-site
comparison app/helpers/queries_helper.rb @ 507:0c939c159af4 redmine-1.2
Update to Redmine 1.2.1 on 1.2-stable branch (Redmine SVN rev 6270)
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:32:19 +0100 |
parents | cbce1fd3b1b7 |
children | cbb26bc654de |
comparison
equal
deleted
inserted
replaced
441:cbce1fd3b1b7 | 507:0c939c159af4 |
---|---|
68 def retrieve_query | 68 def retrieve_query |
69 if !params[:query_id].blank? | 69 if !params[:query_id].blank? |
70 cond = "project_id IS NULL" | 70 cond = "project_id IS NULL" |
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 @query.project = @project | 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 else | 77 else |
77 if api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) | 78 if api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil) |