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/assets/javascripts/boards/components/board_form.vue | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/boards/components/board_form.vue')
-rw-r--r-- | app/assets/javascripts/boards/components/board_form.vue | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue index c701ecd3040..f65f00bcccc 100644 --- a/app/assets/javascripts/boards/components/board_form.vue +++ b/app/assets/javascripts/boards/components/board_form.vue @@ -1,17 +1,17 @@ <script> import { GlModal } from '@gitlab/ui'; -import { __, s__ } from '~/locale'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import { visitUrl } from '~/lib/utils/url_utility'; -import { getParameterByName } from '~/lib/utils/common_utils'; import { convertToGraphQLId } from '~/graphql_shared/utils'; -import boardsStore from '~/boards/stores/boards_store'; +import { getParameterByName } from '~/lib/utils/common_utils'; +import { visitUrl } from '~/lib/utils/url_utility'; +import { __, s__ } from '~/locale'; import { fullLabelId, fullBoardId } from '../boards_util'; +import { formType } from '../constants'; -import BoardConfigurationOptions from './board_configuration_options.vue'; -import updateBoardMutation from '../graphql/board_update.mutation.graphql'; import createBoardMutation from '../graphql/board_create.mutation.graphql'; import destroyBoardMutation from '../graphql/board_destroy.mutation.graphql'; +import updateBoardMutation from '../graphql/board_update.mutation.graphql'; +import BoardConfigurationOptions from './board_configuration_options.vue'; const boardDefaults = { id: false, @@ -26,12 +26,6 @@ const boardDefaults = { hide_closed_list: false, }; -const formType = { - new: 'new', - delete: 'delete', - edit: 'edit', -}; - export default { i18n: { [formType.new]: { title: s__('Board|Create new board'), btnText: s__('Board|Create board') }, @@ -100,11 +94,14 @@ export default { type: Object, required: true, }, + currentPage: { + type: String, + required: true, + }, }, data() { return { board: { ...boardDefaults, ...this.currentBoard }, - currentPage: boardsStore.state.currentPage, isLoading: false, }; }, @@ -256,7 +253,7 @@ export default { } }, cancel() { - boardsStore.showPage(''); + this.$emit('cancel'); }, resetFormState() { if (this.isNewForm) { @@ -308,6 +305,7 @@ export default { <board-configuration-options :hide-backlog-list.sync="board.hide_backlog_list" :hide-closed-list.sync="board.hide_closed_list" + :readonly="readonly" /> <board-scope |