Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/invite_members_helper.rb')
-rw-r--r--app/helpers/invite_members_helper.rb34
1 files changed, 6 insertions, 28 deletions
diff --git a/app/helpers/invite_members_helper.rb b/app/helpers/invite_members_helper.rb
index 889c058cb21..3c290701a5f 100644
--- a/app/helpers/invite_members_helper.rb
+++ b/app/helpers/invite_members_helper.rb
@@ -8,7 +8,7 @@ module InviteMembersHelper
end
def can_invite_group_for_project?(project)
- Feature.enabled?(:invite_members_group_modal, project.group) && project.allowed_to_share_with_group?
+ Feature.enabled?(:invite_members_group_modal, project.group) && can_manage_project_members?(project) && project.allowed_to_share_with_group?
end
def directly_invite_members?
@@ -21,17 +21,6 @@ module InviteMembersHelper
experiment_enabled?(:invite_members_empty_group_version_a) && Ability.allowed?(current_user, :admin_group_member, group)
end
- def dropdown_invite_members_link(form_model)
- link_to invite_members_url(form_model),
- data: {
- 'track-event': 'click_link',
- 'track-label': tracking_label,
- 'track-property': experiment_tracking_category_and_group(:invite_members_new_dropdown)
- } do
- invite_member_link_content
- end
- end
-
def invite_accepted_notice(member)
case member.source
when Project
@@ -43,22 +32,11 @@ module InviteMembersHelper
end
end
- private
-
- def invite_members_url(form_model)
- case form_model
- when Project
- project_project_members_path(form_model)
- when Group
- group_group_members_path(form_model)
+ def group_select_data(group)
+ if group.root_ancestor.namespace_settings.prevent_sharing_groups_outside_hierarchy
+ { groups_filter: 'descendant_groups', parent_id: group.root_ancestor.id }
+ else
+ {}
end
end
-
- def invite_member_link_content
- text = s_('InviteMember|Invite members')
-
- return text unless experiment_enabled?(:invite_members_new_dropdown)
-
- "#{text} #{emoji_icon('shaking_hands', 'aria-hidden': true, class: 'gl-font-base gl-vertical-align-baseline')}".html_safe
- end
end