Merge pull request #50 from kaishuu0123/master

Release
kaishuu0123 · Dec 13, 2019 · 2cf84f1 · 2cf84f1
2 parents 6611c53 + 9f4335b
commit 2cf84f1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/app/javascript/components/backlogs/BacklogsCard.vue b/app/javascript/components/backlogs/BacklogsCard.vue
@@ -85,6 +85,10 @@ export default {
       })
     },
     searchStoryByKeyword(stories) {
+      if (this.searchKeyword == null) {
+        return stories;
+      }
+
       return stories.filter(story => {
         return this.searchKeyword.toLowerCase()
           .split(/\s+/)

diff --git a/app/javascript/components/backlogs/SprintCard.vue b/app/javascript/components/backlogs/SprintCard.vue
@@ -207,6 +207,10 @@ export default {
       })
     },
     searchStoryByKeyword(stories) {
+      if (this.searchKeyword == null) {
+        return stories;
+      }
+
       return stories.filter(story => {
         return this.searchKeyword.toLowerCase()
           .split(/\s+/)

diff --git a/app/javascript/components/commons/TicketForm.vue b/app/javascript/components/commons/TicketForm.vue
@@ -74,6 +74,14 @@ export default {
       this.$refs.titleInput.focus()
     })
   },
+  watch: {
+    isLoading: function(newLoading, oldLoading) {
+      Vue.nextTick(() => {
+        // Focus Input
+        this.$refs.titleInput.focus()
+      })
+    }
+  },
   methods: {
     updateValue(key, value) {
       this.ticket[key] = value;

diff --git a/app/javascript/components/kanban/TaskModal.vue b/app/javascript/components/kanban/TaskModal.vue
@@ -66,6 +66,11 @@
                   <i class="fas fa-pen mr-1" /> {{ $t('action.edit') }}
                 </button>
               </div>
+              <div v-else-if="isEdit && !isNew" class="mr-2">
+                <button type="button" class="btn rb-btn-s btn-outline-secondary shadow-sm" @click="() => this.$refs.ticketForm.handleSubmit()">
+                  <i class="fas fa-pen mr-1" /> {{ $t('action.submit') }}
+                </button>
+              </div>
               <button type="button" class="btn rb-btn-s btn-outline-secondary shadow-sm" @click="() => this.$refs.modal.hide()">
                 <i class="fas fa-times mr-1" /> {{ $t('action.close') }}
               </button>
@@ -103,7 +108,8 @@
               :ticket="task"
               ticketType="tasks"
               :isLoading="isLoading"
-              :afterSubmit="afterSubmit" />
+              :afterSubmit="afterSubmit"
+              ref="ticketForm" />
             <TicketPreview
               v-else
               :projectId="projectId"

diff --git a/app/javascript/pages/KanbanPage.vue b/app/javascript/pages/KanbanPage.vue
@@ -272,6 +272,10 @@ export default {
       }
     },
     searchStoryAndTaskByKeyword(stories) {
+      if (this.searchKeyword == null) {
+        return stories;
+      }
+
       return stories.filter(story => {
         return this.searchKeyword.toLowerCase()
           .split(/\s+/)