kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 18:35:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Task isRunning is based on both the task state and the allocation state

Browse Source
This commit is contained in:
Michael Lange
2018-12-10 15:24:39 -08:00
parent 605d7a245f
commit c1c40af236
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/models/task-state.js
View File

@@ -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');