diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-16 09:43:33 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-05-16 09:43:33 +0100 |
commit | 64e159ada06a6f69742cb530894334cd099b667f (patch) | |
tree | 91261fdc4dc5263820b0c89c25ea1b2ff48ab5ad /app/assets/javascripts/issue_show/components/app.vue | |
parent | 36df19e71b53a78da9db15b65c405c50089da7b3 (diff) | |
download | gitlab-ce-64e159ada06a6f69742cb530894334cd099b667f.tar.gz |
Created form component instead of using :is incorrectly
[ci skip]
Diffstat (limited to 'app/assets/javascripts/issue_show/components/app.vue')
-rw-r--r-- | app/assets/javascripts/issue_show/components/app.vue | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue index abddcaa2594..b4034849c71 100644 --- a/app/assets/javascripts/issue_show/components/app.vue +++ b/app/assets/javascripts/issue_show/components/app.vue @@ -7,7 +7,7 @@ import Service from '../services/index'; import Store from '../stores'; import titleComponent from './title.vue'; import descriptionComponent from './description.vue'; -import editActions from './edit_actions.vue'; +import formComponent from './form.vue'; export default { props: { @@ -56,9 +56,6 @@ export default { }; }, computed: { - elementType() { - return this.showForm ? 'form' : 'div'; - }, formState() { return this.store.formState; }, @@ -66,7 +63,7 @@ export default { components: { descriptionComponent, titleComponent, - editActions, + formComponent, }, methods: { openForm() { @@ -143,22 +140,23 @@ export default { </script> <template> - <div :is="elementType"> - <title-component - :form-state="formState" - :show-form="showForm" - :issuable-ref="issuableRef" - :title-html="state.titleHtml" - :title-text="state.titleText" /> - <description-component - v-if="state.descriptionHtml" - :can-update="canUpdate" - :description-html="state.descriptionHtml" - :description-text="state.descriptionText" - :updated-at="state.updatedAt" - :task-status="state.taskStatus" /> - <edit-actions + <div> + <form-component v-if="canUpdate && showForm" + :form-state="formState" :can-destroy="canDestroy" /> + <div v-else> + <title-component + :issuable-ref="issuableRef" + :title-html="state.titleHtml" + :title-text="state.titleText" /> + <description-component + v-if="state.descriptionHtml" + :can-update="canUpdate" + :description-html="state.descriptionHtml" + :description-text="state.descriptionText" + :updated-at="state.updatedAt" + :task-status="state.taskStatus" /> + </div> </div> </template> |