From f97afaa25894e2476c92a9ef2bf632fed02a8bf0 Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Fri, 24 Nov 2017 15:40:30 +0100 Subject: [PATCH] fix(dailyPlanner): fix task suggestions --- app-src/scripts/daily-planner/daily-planner-d.html | 2 +- app-src/scripts/daily-planner/daily-planner-d.js | 11 ++++++----- .../dialogs/edit-global-link/edit-global-link-c.html | 2 +- .../dialogs/task-selection/task-selection-c.html | 2 +- app-src/scripts/dialogs/was-idle/was-idle-c.html | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app-src/scripts/daily-planner/daily-planner-d.html b/app-src/scripts/daily-planner/daily-planner-d.html index 80c05754d9..a8baf0e4d5 100644 --- a/app-src/scripts/daily-planner/daily-planner-d.html +++ b/app-src/scripts/daily-planner/daily-planner-d.html @@ -24,7 +24,7 @@ placeholder="Select or create a task"> {{task.title}} + md-highlight-flags="i">{{task.title}} diff --git a/app-src/scripts/daily-planner/daily-planner-d.js b/app-src/scripts/daily-planner/daily-planner-d.js index 710fe440bd..25249b243e 100644 --- a/app-src/scripts/daily-planner/daily-planner-d.js +++ b/app-src/scripts/daily-planner/daily-planner-d.js @@ -30,6 +30,8 @@ const _ = $window._; vm.refreshRemoteTasks = () => { + vm.taskSuggestions = []; + if (IS_ELECTRON && Jira.isSufficientJiraSettings()) { Jira.checkForNewAndAddToBacklog(); @@ -49,9 +51,12 @@ } }; + vm.getFilteredTaskSuggestions = (searchText) => { + return searchText ? $filter('filter')(vm.taskSuggestions, searchText, false, 'title') : vm.taskSuggestions; + }; + vm.init = () => { vm.limitBacklogTo = 3; - vm.taskSuggestions = []; vm.backlogTasks = Tasks.getBacklog(); vm.isRemoteTasks = (IS_ELECTRON && Jira.isSufficientJiraSettings() || $rootScope.r.git.isAutoImportToBacklog); @@ -59,10 +64,6 @@ }; vm.init(); - vm.getFilteredTaskSuggestions = (searchText) => { - return searchText ? $filter('filter')(vm.taskSuggestions, searchText, false, 'title') : vm.taskSuggestions; - }; - vm.addTask = () => { if (vm.newTask) { if (vm.newTask.originalType && vm.newTask.originalType === 'GITHUB' && $rootScope.r.git.isShowIssuesFromGit) { diff --git a/app-src/scripts/dialogs/edit-global-link/edit-global-link-c.html b/app-src/scripts/dialogs/edit-global-link/edit-global-link-c.html index a81e9d31c0..d077b29cc9 100644 --- a/app-src/scripts/dialogs/edit-global-link/edit-global-link-c.html +++ b/app-src/scripts/dialogs/edit-global-link/edit-global-link-c.html @@ -81,7 +81,7 @@ placeholder="Select task"> {{ task.title }} + md-highlight-flags="i">{{ task.title }} No task found diff --git a/app-src/scripts/dialogs/task-selection/task-selection-c.html b/app-src/scripts/dialogs/task-selection/task-selection-c.html index 7acb12c684..fc2afdf313 100644 --- a/app-src/scripts/dialogs/task-selection/task-selection-c.html +++ b/app-src/scripts/dialogs/task-selection/task-selection-c.html @@ -19,7 +19,7 @@ placeholder="Select a task to start with"> {{ task.title }} + md-highlight-flags="i">{{ task.title }} No states matching "" were found. diff --git a/app-src/scripts/dialogs/was-idle/was-idle-c.html b/app-src/scripts/dialogs/was-idle/was-idle-c.html index 3f622b4904..8b6876a55d 100644 --- a/app-src/scripts/dialogs/was-idle/was-idle-c.html +++ b/app-src/scripts/dialogs/was-idle/was-idle-c.html @@ -31,7 +31,7 @@ placeholder="Select a task to track the time">