Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-02-01 12:20:12 +01:00
Code Issues Packages Projects Releases Activity

Merged r21614 to 5.0-stable (#37135).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21622 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2022-05-28 18:29:24 +00:00
parent 78036b902c
commit 9fb1c60ef2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/project_query.rb
View File

@@ -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)