diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-07 12:10:00 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-07 12:10:00 +0300 |
commit | f4a9d976cf03888fbfd81ab9813720f4e8ec8056 (patch) | |
tree | d67ce5ca8885d3f836b89be0a96d52ba602aa533 /app/assets/javascripts/projects | |
parent | 28b137b0948e74805040b0c069ea09ff91f06143 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/projects')
-rw-r--r-- | app/assets/javascripts/projects/new/components/new_project_url_select.vue | 19 | ||||
-rw-r--r-- | app/assets/javascripts/projects/project_new.js | 1 |
2 files changed, 12 insertions, 8 deletions
diff --git a/app/assets/javascripts/projects/new/components/new_project_url_select.vue b/app/assets/javascripts/projects/new/components/new_project_url_select.vue index e6a02a0d67d..eccfb3d844c 100644 --- a/app/assets/javascripts/projects/new/components/new_project_url_select.vue +++ b/app/assets/javascripts/projects/new/components/new_project_url_select.vue @@ -57,10 +57,7 @@ export default { id: this.namespaceId, fullPath: this.namespaceFullPath, } - : { - id: undefined, - fullPath: s__('ProjectsNew|Pick a group or namespace'), - }, + : this.$options.emptyNameSpace, shouldSkipQuery: true, userNamespaceId: this.userNamespaceId, }; @@ -120,12 +117,18 @@ export default { this.setNamespace({ id, fullPath }); }, setNamespace({ id, fullPath }) { - this.selectedNamespace = { - id: getIdFromGraphQLId(id), - fullPath, - }; + this.selectedNamespace = id + ? { + id: getIdFromGraphQLId(id), + fullPath, + } + : this.$options.emptyNameSpace; }, }, + emptyNameSpace: { + id: undefined, + fullPath: s__('ProjectsNew|Pick a group or namespace'), + }, }; </script> diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js index 186946a83ad..fe84660422b 100644 --- a/app/assets/javascripts/projects/project_new.js +++ b/app/assets/javascripts/projects/project_new.js @@ -342,6 +342,7 @@ const bindEvents = () => { export default { bindEvents, + validateGroupNamespaceDropdown, deriveProjectPathFromUrl, onProjectNameChange, onProjectPathChange, |