From 8be29b64d8f8b97bcc3866579039e999ec37e5ad Mon Sep 17 00:00:00 2001 From: Marius Balteanu Date: Sat, 28 May 2022 09:54:34 +0000 Subject: [PATCH] Reduce extra queries in @ProjectQuery.default@ (#37135). Patch by Dmitry Makurin. git-svn-id: https://svn.redmine.org/redmine/trunk@21614 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/project_query.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/models/project_query.rb b/app/models/project_query.rb index 852beb95c..57d0330d1 100644 --- a/app/models/project_query.rb +++ b/app/models/project_query.rb @@ -41,10 +41,13 @@ class ProjectQuery < Query def self.default(project: nil, user: User.current) query = nil - if user&.logged? - query = find_by_id user.pref.default_project_query + if user&.logged? && (query_id = user.pref.default_project_query).present? + query = find_by(id: query_id) end - query || find_by_id(Setting.default_project_query) + if query.nil? && (query_id = Setting.default_project_query).present? + query = find_by(id: query_id) + end + query end def initialize(attributes=nil, *args) -- 2.39.5