From ab271353c58bed581ba635f358e582e4dfc6437c Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Wed, 27 Nov 2019 13:31:44 +0900
Subject: [PATCH] Fix #469

---
 .../components/organisms/labels/LabelCreationForm.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/components/organisms/labels/LabelCreationForm.vue b/frontend/components/organisms/labels/LabelCreationForm.vue
index 04b63426..3ca095f2 100644
--- a/frontend/components/organisms/labels/LabelCreationForm.vue
+++ b/frontend/components/organisms/labels/LabelCreationForm.vue
@@ -5,7 +5,7 @@
     cancel-text="Cancel"
     :disabled="!valid"
     @agree="create"
-    @cancel="cancel"
+    @cancel="reset"
   >
     <template #content>
       <v-form
@@ -87,6 +87,7 @@ export default {
     },
     reset() {
       this.$refs.form.reset()
+      this.cancel('close')
     },
     create() {
       if (this.validate()) {
@@ -94,13 +95,12 @@ export default {
           projectId: this.$route.params.id,
           text: this.labelName,
           prefix_key: null,
-          suffix_key: this.suffixKey,
-          background_color: this.color.slice(0, -2),
+          suffix_key: this.suffixKey ? this.suffixKey : null,
+          background_color: this.color.slice(0, 7), // #12345678 -> #123456
           text_color: '#ffffff'
         })
           .then(() => {
             this.reset()
-            this.cancel()
           })
           .catch(() => {
             this.showError = true