diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-21 18:08:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-21 18:08:37 +0300 |
commit | 84b4743475246e91dc78c3f25f9b335c40be84cd (patch) | |
tree | bd65fa4db67a129f7e7f992a27a926a87970a0ed /app/assets/javascripts/invite_members | |
parent | 8f2f35ad2e5027a0aedc56dd239ffe38fcc3f09f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/invite_members')
-rw-r--r-- | app/assets/javascripts/invite_members/components/group_select.vue | 23 | ||||
-rw-r--r-- | app/assets/javascripts/invite_members/components/invite_groups_modal.vue | 1 |
2 files changed, 10 insertions, 14 deletions
diff --git a/app/assets/javascripts/invite_members/components/group_select.vue b/app/assets/javascripts/invite_members/components/group_select.vue index 04a8ec3400f..fc14b2eba6a 100644 --- a/app/assets/javascripts/invite_members/components/group_select.vue +++ b/app/assets/javascripts/invite_members/components/group_select.vue @@ -24,10 +24,6 @@ export default { prop: 'selectedGroup', }, props: { - accessLevels: { - type: Object, - required: true, - }, groupsFilter: { type: String, required: false, @@ -58,13 +54,6 @@ export default { isFetchResultEmpty() { return this.groups.length === 0; }, - defaultFetchOptions() { - return { - exclude_internal: true, - active: true, - min_access_level: this.accessLevels.Guest, - }; - }, }, watch: { searchTerm() { @@ -107,9 +96,13 @@ export default { fetchGroups() { switch (this.groupsFilter) { case GROUP_FILTERS.DESCENDANT_GROUPS: - return getDescendentGroups(this.parentGroupId, this.searchTerm, this.defaultFetchOptions); + return getDescendentGroups( + this.parentGroupId, + this.searchTerm, + this.$options.defaultFetchOptions, + ); default: - return getGroups(this.searchTerm, this.defaultFetchOptions); + return getGroups(this.searchTerm, this.$options.defaultFetchOptions); } }, }, @@ -118,6 +111,10 @@ export default { searchPlaceholder: s__('GroupSelect|Search groups'), emptySearchResult: s__('GroupSelect|No matching results'), }, + defaultFetchOptions: { + exclude_internal: true, + active: true, + }, }; </script> <template> diff --git a/app/assets/javascripts/invite_members/components/invite_groups_modal.vue b/app/assets/javascripts/invite_members/components/invite_groups_modal.vue index f266d978ffa..f145c00f4fd 100644 --- a/app/assets/javascripts/invite_members/components/invite_groups_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_groups_modal.vue @@ -155,7 +155,6 @@ export default { <template #select> <group-select v-model="groupToBeSharedWith" - :access-levels="accessLevels" :groups-filter="groupSelectFilter" :parent-group-id="groupSelectParentId" :invalid-groups="invalidGroups" |