Merged r21748 from trunk to 5.0-stable (#37499).

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

2 files changed, 12 insertions, 7 deletions

diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb
index 45ffcb57c..aa8dc9034 100644
--- a/app/models/issue_query.rb
+++ b/app/models/issue_query.rb
@@ -78,18 +78,22 @@ class IssueQuery < Query
   scope :for_all_projects, ->{ where(project_id: nil) }
 
   def self.default(project: nil, user: User.current)
-    query = nil
     # user default
     if user&.logged? && (query_id = user.pref.default_issue_query).present?
       query = find_by(id: query_id)
+      return query if query&.visible?
     end
+
     # project default
-    query ||= project&.default_issue_query
+    query = project&.default_issue_query
+    return query if query&.visibility == VISIBILITY_PUBLIC
+
     # global default
-    if query.nil? && (query_id = Setting.default_issue_query).present?
+    if (query_id = Setting.default_issue_query).present?
       query = find_by(id: query_id)
+      return query if query&.visibility == VISIBILITY_PUBLIC
     end
-    query
+    nil
   end
 
   def initialize(attributes=nil, *args)
diff --git a/app/models/project_query.rb b/app/models/project_query.rb
index 8c6643c7b..acb518f34 100644
--- a/app/models/project_query.rb
+++ b/app/models/project_query.rb
@@ -38,14 +38,15 @@ class ProjectQuery < Query
   ]
 
   def self.default(project: nil, user: User.current)
-    query = nil
     if user&.logged? && (query_id = user.pref.default_project_query).present?
       query = find_by(id: query_id)
+      return query if query&.visible?
     end
-    if query.nil? && (query_id = Setting.default_project_query).present?
+    if (query_id = Setting.default_project_query).present?
       query = find_by(id: query_id)
+      return query if query&.visibility == VISIBILITY_PUBLIC
     end
-    query
+    nil
   end
 
   def initialize(attributes=nil, *args)