diff options
author | James Lopez <james@jameslopez.es> | 2016-09-19 12:29:49 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-09-20 10:15:20 +0200 |
commit | 254c5aaa92c336d8e17beae546b34a056a954c17 (patch) | |
tree | 2575c3c93bdb7e6123e40afa1ab9f9cfd4a80c71 /app/helpers/namespaces_helper.rb | |
parent | 173b1128ff485d6614b8a785796d575d4d84dd68 (diff) | |
download | gitlab-ce-254c5aaa92c336d8e17beae546b34a056a954c17.tar.gz |
few fixes based on MR feedback
Diffstat (limited to 'app/helpers/namespaces_helper.rb')
-rw-r--r-- | app/helpers/namespaces_helper.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb index 4641076d22c..e0b8dc1393b 100644 --- a/app/helpers/namespaces_helper.rb +++ b/app/helpers/namespaces_helper.rb @@ -1,8 +1,8 @@ module NamespacesHelper - def namespaces_options(selected = :current_user, extra_groups = [], display_path: false) + def namespaces_options(selected = :current_user, display_path: false, extra_group: nil) groups = current_user.owned_groups + current_user.masters_groups - groups += process_extra_groups(extra_groups) if extra_groups.any? + groups << extra_group if extra_group && !Group.exists?(name: extra_group.name) users = [current_user.namespace] @@ -28,15 +28,6 @@ module NamespacesHelper grouped_options_for_select(options, selected) end - def process_extra_groups(extra_groups) - # Remove duplicate groups - we either keep the ones that exist for the user - # (already in groups) or ignore those that do not belong to the user. - duplicated_groups = extra_groups.map { |name| Namespace.where(name: name).pluck(:name) } - extra_groups = extra_groups - duplicated_groups.flatten - - extra_groups.map { |name| Group.new(name: name) } - end - def namespace_icon(namespace, size = 40) if namespace.kind_of?(Group) group_icon(namespace) |