diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/helpers/groups/group_members_helper.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/helpers/groups/group_members_helper.rb')
-rw-r--r-- | app/helpers/groups/group_members_helper.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/helpers/groups/group_members_helper.rb b/app/helpers/groups/group_members_helper.rb index a4159ed6b19..3e7d6febabf 100644 --- a/app/helpers/groups/group_members_helper.rb +++ b/app/helpers/groups/group_members_helper.rb @@ -13,12 +13,12 @@ module Groups::GroupMembersHelper render 'shared/members/invite_member', submit_url: group_group_members_path(group), access_levels: group.access_level_roles, default_access_level: default_access_level end - def linked_groups_data_json(group_links) - GroupGroupLinkSerializer.new.represent(group_links, { current_user: current_user }).to_json + def group_group_links_data_json(group_links) + GroupLink::GroupGroupLinkSerializer.new.represent(group_links, { current_user: current_user }).to_json end def members_data_json(group, members) - MemberSerializer.new.represent(members, { current_user: current_user, group: group }).to_json + MemberSerializer.new.represent(members, { current_user: current_user, group: group, source: group }).to_json end # Overridden in `ee/app/helpers/ee/groups/group_members_helper.rb` @@ -26,16 +26,16 @@ module Groups::GroupMembersHelper { members: members_data_json(group, members), member_path: group_group_member_path(group, ':id'), - group_id: group.id, + source_id: group.id, can_manage_members: can?(current_user, :admin_group_member, group).to_s } end - def linked_groups_list_data_attributes(group) + def group_group_links_list_data_attributes(group) { - members: linked_groups_data_json(group.shared_with_group_links), + members: group_group_links_data_json(group.shared_with_group_links), member_path: group_group_link_path(group, ':id'), - group_id: group.id + source_id: group.id } end end |