From 76eeb316df2f256d0d3c41d97421f709a21a02a8 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Sun, 13 Mar 2016 10:05:32 +0100 Subject: Create an external users tab on Admin user list Also incorporates the review into this, mainly spec changes. --- app/finders/projects_finder.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'app/finders/projects_finder.rb') diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index 711d9019a3d..4a6c2fbd71c 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -40,18 +40,23 @@ class ProjectsFinder private def group_projects(current_user, group) - if current_user + return [group.projects.public_only] unless current_user + + if current_user.external? [ group_projects_for_user(current_user, group), - group.projects.public_and_internal_only + group.projects.public_only ] else - [group.projects.public_only] + [ + group_projects_for_user(current_user, group), + group.projects.public_and_internal_only + ] end end def all_projects(current_user) - return [Project.public_only] unless current_user + return [public_projects] unless current_user if current_user.external? [current_user.authorized_projects, public_projects] -- cgit v1.2.3