From c1c40af236cf97a47849db78060f9e70a034adfa Mon Sep 17 00:00:00 2001
From: Michael Lange <dingoeatingfuzz@gmail.com>
Date: Mon, 10 Dec 2018 15:24:39 -0800
Subject: [PATCH] Task isRunning is based on both the task state and the
 allocation state

---
 ui/app/models/task-state.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/app/models/task-state.js b/ui/app/models/task-state.js
index c8e25912b..eb1dcd534 100644
--- a/ui/app/models/task-state.js
+++ b/ui/app/models/task-state.js
@@ -1,5 +1,5 @@
 import { computed } from '@ember/object';
-import { alias, none } from '@ember/object/computed';
+import { alias, none, and } from '@ember/object/computed';
 import Fragment from 'ember-data-model-fragments/fragment';
 import attr from 'ember-data/attr';
 import { fragment, fragmentOwner, fragmentArray } from 'ember-data-model-fragments/attributes';
@@ -14,7 +14,7 @@ export default Fragment.extend({
   failed: attr('boolean'),
 
   isActive: none('finishedAt'),
-  isRunning: alias('allocation.isRunning'),
+  isRunning: and('isActive', 'allocation.isRunning'),
 
   task: computed('allocation.taskGroup.tasks.[]', function() {
     const tasks = this.get('allocation.taskGroup.tasks');