From 6654cc35f7adc99e4378374ff062aa2bfbd9995c Mon Sep 17 00:00:00 2001 From: Marliana Lara Date: Tue, 14 Nov 2017 12:26:34 -0500 Subject: [PATCH] Add relaunch component to Completed Jobs list --- .../lib/components/relaunchButton/relaunchButton.component.js | 2 +- .../inventories/related/completed-jobs/completed-jobs.list.js | 3 ++- awx/ui/client/src/jobs/all-jobs.list.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js index 089abf8625..465404c10e 100644 --- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js +++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js @@ -12,7 +12,7 @@ const atRelaunch = { function atRelaunchCtrl (RelaunchJob, InitiatePlaybookRun, strings, $scope) { const vm = this; const scope = $scope.$parent; - const { job } = $scope.$parent; + const job = _.get(scope, 'job') || _.get(scope, 'completed_job'); vm.$onInit = () => { vm.showRelaunch = !(job.type === 'system_job') && job.summary_fields.user_capabilities.start; diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js index 6b5e86d27c..8580524392 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.list.js @@ -76,7 +76,8 @@ export default ['i18n', function(i18n) { ngClick: 'relaunchJob($event, completed_job.id)', awToolTip: i18n._('Relaunch using the same parameters'), dataPlacement: 'top', - ngShow: "!completed_job.type == 'system_job' || completed_job.summary_fields.user_capabilities.start" + ngShow: "!completed_job.type == 'system_job' || completed_job.summary_fields.user_capabilities.start", + relaunch: true }, "delete": { mode: 'all', diff --git a/awx/ui/client/src/jobs/all-jobs.list.js b/awx/ui/client/src/jobs/all-jobs.list.js index 19744982e9..f7737903a0 100644 --- a/awx/ui/client/src/jobs/all-jobs.list.js +++ b/awx/ui/client/src/jobs/all-jobs.list.js @@ -92,7 +92,7 @@ export default ['i18n', function(i18n) { dataPlacement: "top" }, submit: { - icon: 'icon-launch', + icon: 'icon-rocket', mode: 'all', ngClick: 'relaunchJob($event, job.id)', awToolTip: i18n._('Relaunch using the same parameters'),