diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-14 15:10:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-14 15:10:12 +0300 |
commit | 14a0edee5c04b04b5281f99ce7f6ba75b919dba1 (patch) | |
tree | 98484def7f8c4ad9c371664e40ddfef523340fad /app/assets/javascripts/search | |
parent | 7a7f602c2689ef1d204976b23a8e89bdf927e8e2 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/search')
-rw-r--r-- | app/assets/javascripts/search/topbar/components/group_filter.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/search/topbar/components/project_filter.vue | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/search/topbar/components/group_filter.vue b/app/assets/javascripts/search/topbar/components/group_filter.vue index e5edb21792a..4798f1127eb 100644 --- a/app/assets/javascripts/search/topbar/components/group_filter.vue +++ b/app/assets/javascripts/search/topbar/components/group_filter.vue @@ -19,7 +19,7 @@ export default { }, computed: { ...mapState(['query', 'groups', 'fetchingGroups']), - ...mapGetters(['frequentGroups']), + ...mapGetters(['frequentGroups', 'currentScope']), selectedGroup() { return isEmpty(this.initialData) ? ANY_OPTION : this.initialData; }, @@ -43,6 +43,7 @@ export default { [GROUP_DATA.queryParam]: group.id, [PROJECT_DATA.queryParam]: null, nav_source: null, + scope: this.currentScope, }), ); }, diff --git a/app/assets/javascripts/search/topbar/components/project_filter.vue b/app/assets/javascripts/search/topbar/components/project_filter.vue index 85cf2ddbbff..1cce3e3db8b 100644 --- a/app/assets/javascripts/search/topbar/components/project_filter.vue +++ b/app/assets/javascripts/search/topbar/components/project_filter.vue @@ -18,7 +18,7 @@ export default { }, computed: { ...mapState(['query', 'projects', 'fetchingProjects']), - ...mapGetters(['frequentProjects']), + ...mapGetters(['frequentProjects', 'currentScope']), selectedProject() { return this.initialData ? this.initialData : ANY_OPTION; }, @@ -42,6 +42,7 @@ export default { ...(project.namespace?.id && { [GROUP_DATA.queryParam]: project.namespace.id }), [PROJECT_DATA.queryParam]: project.id, nav_source: null, + scope: this.currentScope, }; visitUrl(setUrlParams(queryParams)); |