1
0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 19:47:14 +00:00

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
This commit is contained in:
Marius Balteanu 2022-05-28 09:54:34 +00:00
parent fcf792615a
commit 8be29b64d8

View File

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