From a79632968cf4e42af7bbf99ddf1c56a79c0a0d9b Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 1 May 2018 15:19:44 -0700
Subject: [PATCH 1/2] Fixes job template schedule link from Activity Stream

---
 .../src/activity-stream/factories/build-anchor.factory.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
index 2b01398280..1fc031e0e6 100644
--- a/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
+++ b/awx/ui/client/src/activity-stream/factories/build-anchor.factory.js
@@ -38,7 +38,7 @@ export default function BuildAnchor($log, $filter) {
                  case 'schedule':
                      // schedule urls depend on the resource they're associated with
                      if (activity.summary_fields.job_template){
-                         url += 'job_templates/' + activity.summary_fields.job_template.id + '/schedules/' + obj.id;
+                         url += 'templates/job_template/' + activity.summary_fields.job_template.id + '/schedules/' + obj.id;
                      }
                      else if (activity.summary_fields.project){
                          url += 'projects/' + activity.summary_fields.project.id + '/schedules/' + obj.id;

From a840ec408931418c92ea6a43107496a7f6521bb1 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Tue, 1 May 2018 15:36:47 -0700
Subject: [PATCH 2/2] Fixes jobs' page activity stream link, and remove AS
 button on job results page

---
 awx/ui/client/features/jobs/routes/jobs.route.js | 2 ++
 awx/ui/client/features/output/index.js           | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/features/jobs/routes/jobs.route.js b/awx/ui/client/features/jobs/routes/jobs.route.js
index c3ee0b4fef..9129fed3d1 100644
--- a/awx/ui/client/features/jobs/routes/jobs.route.js
+++ b/awx/ui/client/features/jobs/routes/jobs.route.js
@@ -22,6 +22,8 @@ export default {
         }
     },
     data: {
+        activityStream: true,
+        activityStreamTarget: 'job',
         socket: {
             groups: {
                 jobs: ['status_changed'],
diff --git a/awx/ui/client/features/output/index.js b/awx/ui/client/features/output/index.js
index 3aaadc2553..35fa91ef6e 100644
--- a/awx/ui/client/features/output/index.js
+++ b/awx/ui/client/features/output/index.js
@@ -169,8 +169,7 @@ function JobsRun ($stateRegistry) {
         url: '/jobz/:type/:id?job_event_search',
         route: '/jobz/:type/:id?job_event_search',
         data: {
-            activityStream: true,
-            activityStreamTarget: 'jobs'
+            activityStream: false,
         },
         views: {
             '@': {