mirror of
https://github.com/meineerde/redmine.git
synced 2026-02-11 13:15:20 +00:00
Reduce an extra SQL query in IssuesController#retrieve_default_query (#40775).
Patch by Go MAEDA (@maeda). git-svn-id: https://svn.redmine.org/redmine/trunk@22854 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
7090378756
commit
c19176a5c4
@ -502,8 +502,9 @@ class IssuesController < ApplicationController
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
if !params[:set_filter] && use_session && session[:issue_query]
|
if !params[:set_filter] && use_session && session[:issue_query]
|
||||||
|
# Don't apply the default query if a valid query id is set in the session
|
||||||
query_id, project_id = session[:issue_query].values_at(:id, :project_id)
|
query_id, project_id = session[:issue_query].values_at(:id, :project_id)
|
||||||
return if IssueQuery.where(id: query_id).exists? && project_id == @project&.id
|
return if query_id && project_id == @project&.id && IssueQuery.exists?(id: query_id)
|
||||||
end
|
end
|
||||||
if default_query = IssueQuery.default(project: @project)
|
if default_query = IssueQuery.default(project: @project)
|
||||||
params[:query_id] = default_query.id
|
params[:query_id] = default_query.id
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user