From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Sat, 28 May 2022 18:29:24 +0000 (+0000)
Subject: Merged r21614 to 5.0-stable (#37135).
X-Git-Tag: 5.0.2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9fb1c60ef2af523d8291da233fe909cb2fa50201;p=redmine.git

Merged r21614 to 5.0-stable (#37135).


git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21622 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/project_query.rb b/app/models/project_query.rb
index 002437aeb..8c6643c7b 100644
--- a/app/models/project_query.rb
+++ b/app/models/project_query.rb
@@ -39,10 +39,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)