From cfbbdf867747e1369b400d4fe5bd2b65b2754762 Mon Sep 17 00:00:00 2001 From: Michael Lange Date: Tue, 17 Jul 2018 11:07:22 -0700 Subject: [PATCH] Show deployment deadlines everywhere --- .../components/job-deployment/task-groups.hbs | 12 ++++-------- .../components/job-page/parts/running-deployment.hbs | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ui/app/templates/components/job-deployment/task-groups.hbs b/ui/app/templates/components/job-deployment/task-groups.hbs index 6d6d97f4b..9657b95f1 100644 --- a/ui/app/templates/components/job-deployment/task-groups.hbs +++ b/ui/app/templates/components/job-deployment/task-groups.hbs @@ -14,9 +14,7 @@ Allocs Healthy Allocs Unhealthy Allocs - {{#if inProgress}} - Progress Deadline - {{/if}} + Progress Deadline {{/t.head}} {{#t.body as |row|}} @@ -33,11 +31,9 @@ {{row.model.placedAllocs}} / {{row.model.desiredTotal}} {{row.model.healthyAllocs}} {{row.model.unhealthyAllocs}} - {{#if inProgress}} - - {{moment-format row.model.requireProgressBy "MM/DD/YY HH:mm:ss"}} - - {{/if}} + + {{moment-format row.model.requireProgressBy "MM/DD/YY HH:mm:ss"}} + {{/t.body}} {{/list-table}} diff --git a/ui/app/templates/components/job-page/parts/running-deployment.hbs b/ui/app/templates/components/job-page/parts/running-deployment.hbs index c04d33c92..c42bb866d 100644 --- a/ui/app/templates/components/job-page/parts/running-deployment.hbs +++ b/ui/app/templates/components/job-page/parts/running-deployment.hbs @@ -19,7 +19,7 @@ {{#job-deployment-details deployment=job.runningDeployment as |d|}} {{d.metrics}} {{#if isShowingDeploymentDetails}} - {{d.taskGroups inProgress=true}} + {{d.taskGroups}} {{d.allocations}} {{/if}} {{/job-deployment-details}}