Commit 9e00a237 authored by Yorick Peterse's avatar Yorick Peterse Committed by Robert Speicher

Clean up ProjectsFinder for getting user projects

We don't need the extra layer of nesting of UNION queries here (as
User#authorized_projects already returns a UNION'd query).
parent b77b3b16
...@@ -52,7 +52,10 @@ class ProjectsFinder ...@@ -52,7 +52,10 @@ class ProjectsFinder
def all_projects(current_user) def all_projects(current_user)
if current_user if current_user
[current_user.authorized_projects, public_and_internal_projects] [
*current_user.project_relations,
public_and_internal_projects
]
else else
[Project.public_only] [Project.public_only]
end end
......
...@@ -442,6 +442,11 @@ class User < ActiveRecord::Base ...@@ -442,6 +442,11 @@ class User < ActiveRecord::Base
Project.where("projects.id IN (#{projects_union.to_sql})") Project.where("projects.id IN (#{projects_union.to_sql})")
end end
# Returns all the project relations
def project_relations
[personal_projects, groups_projects, projects]
end
def owned_projects def owned_projects
@owned_projects ||= @owned_projects ||=
Project.where('namespace_id IN (?) OR namespace_id = ?', Project.where('namespace_id IN (?) OR namespace_id = ?',
...@@ -830,9 +835,7 @@ class User < ActiveRecord::Base ...@@ -830,9 +835,7 @@ class User < ActiveRecord::Base
private private
def projects_union def projects_union
Gitlab::SQL::Union.new([personal_projects.select(:id), Gitlab::SQL::Union.new(project_relations.map { |r| r.select(:id) })
groups_projects.select(:id),
projects.select(:id)])
end end
def ci_projects_union def ci_projects_union
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment