diff options
author | George Andrinopoulos <geoandri@gmail.com> | 2017-03-24 18:19:50 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-24 18:19:50 +0000 |
commit | 2f9d50b72fedf09900289e6a0bcf59433d0c05f5 (patch) | |
tree | 8d998283e4f503f24f50cad49104e11ff607b864 /app/helpers | |
parent | c0ce9d0157a8bf4b4e2558ea81987491f17ce6ac (diff) | |
download | gitlab-ce-2f9d50b72fedf09900289e6a0bcf59433d0c05f5.tar.gz |
Resolve "Gitlab administrator cannot create projects in every group"
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/namespaces_helper.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb index 2e3a15bc1b9..7f656b8caae 100644 --- a/app/helpers/namespaces_helper.rb +++ b/app/helpers/namespaces_helper.rb @@ -6,7 +6,13 @@ module NamespacesHelper def namespaces_options(selected = :current_user, display_path: false, extra_group: nil) groups = current_user.owned_groups + current_user.masters_groups - groups << extra_group if extra_group && !Group.exists?(name: extra_group.name) + unless extra_group.nil? || extra_group.is_a?(Group) + extra_group = Group.find(extra_group) if Namespace.find(extra_group).kind == 'group' + end + + if extra_group && extra_group.is_a?(Group) && (!Group.exists?(name: extra_group.name) || Ability.allowed?(current_user, :read_group, extra_group)) + groups |= [extra_group] + end users = [current_user.namespace] |