From 3b4f39742b001d94fac3bee57b1a9edd4dff25fe Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Mon, 30 Nov 2015 10:44:37 -0500 Subject: [PATCH 1/3] The "job" href links in the activity stream don't point to the job details page. This is an update to the jobs href to point to /#/jobs/(job.id). --- awx/ui/client/src/widgets/Stream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/widgets/Stream.js b/awx/ui/client/src/widgets/Stream.js index 5cbd299edf..f05952463b 100644 --- a/awx/ui/client/src/widgets/Stream.js +++ b/awx/ui/client/src/widgets/Stream.js @@ -170,7 +170,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti url += 'home/' + obj.base + 's/?id=' + obj.id; break; case 'job': - url += 'jobs/?id__int=' + obj.id; + url += 'jobs/' + obj.id + '/'; break; case 'inventory': url += 'inventories/' + obj.id + '/'; From 863a31b6fb5ce4fdf65afd345eb5543d4db5c243 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Mon, 30 Nov 2015 15:21:10 -0500 Subject: [PATCH 2/3] Rolled back job url change --- awx/ui/client/src/widgets/Stream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/widgets/Stream.js b/awx/ui/client/src/widgets/Stream.js index f05952463b..5cbd299edf 100644 --- a/awx/ui/client/src/widgets/Stream.js +++ b/awx/ui/client/src/widgets/Stream.js @@ -170,7 +170,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti url += 'home/' + obj.base + 's/?id=' + obj.id; break; case 'job': - url += 'jobs/' + obj.id + '/'; + url += 'jobs/?id__int=' + obj.id; break; case 'inventory': url += 'inventories/' + obj.id + '/'; From d7e77064a2f69d33d1b4248be3e6fd519295f154 Mon Sep 17 00:00:00 2001 From: Michael Abashian Date: Mon, 30 Nov 2015 15:22:44 -0500 Subject: [PATCH 3/3] When the panel lists were consolidated down the list name was changed to 'all_jobs.' When a job is clicked from the activity stream it should show the job list filtered down by ID. --- awx/ui/client/src/helpers/Jobs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/ui/client/src/helpers/Jobs.js b/awx/ui/client/src/helpers/Jobs.js index dac06e03c6..cd3bb677af 100644 --- a/awx/ui/client/src/helpers/Jobs.js +++ b/awx/ui/client/src/helpers/Jobs.js @@ -428,7 +428,7 @@ export default // }, 300); }); - if (base === 'jobs' && list.name === 'completed_jobs') { + if (base === 'jobs' && list.name === 'all_jobs') { if ($routeParams.id__int) { scope[list.iterator + 'SearchField'] = 'id'; scope[list.iterator + 'SearchValue'] = $routeParams.id__int;