kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Return internal projects in PersonalProjectsFinder

Browse source 
When getting the projects of a user we should get the public _and_
internal projects, not just the public ones.
This commit is contained in:
Yorick Peterse 2015-11-18 15:08:28 +01:00
parent 9eefae6917
commit f486b06c4d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/finders/personal_projects_finder.rb
View file

@ -26,7 +26,7 @@ class PersonalProjectsFinder
authorized = @user.personal_projects.visible_to_user(current_user) authorized = @user.personal_projects.visible_to_user(current_user)
union = Gitlab::SQL::Union. union = Gitlab::SQL::Union.
new([authorized.select(:id), public_projects.select(:id)]) new([authorized.select(:id), public_and_internal_projects.select(:id)])
Project.where("projects.id IN (#{union.to_sql})") Project.where("projects.id IN (#{union.to_sql})")
end end
@ -34,4 +34,8 @@ class PersonalProjectsFinder
def public_projects def public_projects
@user.personal_projects.public_only @user.personal_projects.public_only
end end
def public_and_internal_projects
@user.personal_projects.public_and_internal_only
end
end end