diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-12 12:08:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-12 12:08:22 +0300 |
commit | 2e3f13a01a2833f85fb2201a245205b8e9d0ca9a (patch) | |
tree | e827a69320fa3f457d22a243672ab5f0857c2cdd /app/assets/javascripts/pages | |
parent | 9e10ffebdd7550dc72c1124aa5db2eaa97dd0282 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
-rw-r--r-- | app/assets/javascripts/pages/groups/group_members/index.js | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/groups/group_members/index.js b/app/assets/javascripts/pages/groups/group_members/index.js index f3e5ed9727a..79ac31f1659 100644 --- a/app/assets/javascripts/pages/groups/group_members/index.js +++ b/app/assets/javascripts/pages/groups/group_members/index.js @@ -32,12 +32,25 @@ initMembersApp(document.querySelector('.js-group-members-list-app'), { }, }, [MEMBER_TYPES.group]: { - tableFields: SHARED_FIELDS.concat('granted'), + tableFields: gon?.features?.groupMemberInheritedGroup + ? SHARED_FIELDS.concat(['source', 'granted']) + : SHARED_FIELDS.concat(['granted']), tableAttrs: { table: { 'data-qa-selector': 'groups_list' }, tr: { 'data-qa-selector': 'group_row' }, }, requestFormatter: groupLinkRequestFormatter, + ...(gon?.features?.groupMemberInheritedGroup + ? { + filteredSearchBar: { + show: true, + tokens: ['with_inherited_permissions'], + searchParam: 'search_groups', + placeholder: s__('Members|Filter groups'), + recentSearchesStorageKey: 'group_links_members', + }, + } + : {}), }, [MEMBER_TYPES.invite]: { tableFields: SHARED_FIELDS.concat('invited'), |