From d00b8549b4a7b789f176aeea3779079facbc24f1 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 07:22:03 -0400
Subject: [PATCH 1/3] disable activity stream for relaunched job label
 associations

---
 awx/main/models/unified_jobs.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index 943956f7ac..f758a230a9 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -838,8 +838,11 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
                 setattr(unified_job, fd, val)
             unified_job.save()
 
-        # Labels coppied here
-        copy_m2m_relationships(self, unified_job, fields)
+        # Labels copied here
+        from awx.main.signals import disable_activity_stream
+        with disable_activity_stream():
+            copy_m2m_relationships(self, unified_job, fields)
+
         return unified_job
 
     def launch_prompts(self):

From 363266fb89c9ea4b43a92268b3c116ea85dacdc6 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 07:22:16 -0400
Subject: [PATCH 2/3] fix links to workflow jobs on activity stream

---
 .../src/activity-stream/factories/build-anchor.factory.js      | 3 +++
 1 file changed, 3 insertions(+)

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 1fc031e0e6..ae03ae7e11 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
@@ -62,6 +62,9 @@ export default function BuildAnchor($log, $filter) {
                  case 'workflow_job_template':
                      url += `templates/workflow_job_template/${obj.id}`;
                      break;
+                 case 'workflow_job':
+                     url += `workflows/${obj.id}`;
+                     break;
                  default:
                      url += resource + 's/' + obj.id + '/';
              }

From 63c268f9c52763bc5553cc281c0695ff95b97b18 Mon Sep 17 00:00:00 2001
From: Jake McDermott <jmcdermott@ansible.com>
Date: Mon, 7 May 2018 07:22:25 -0400
Subject: [PATCH 3/3] don't render activity stream links for labels

---
 .../factories/build-anchor.factory.js                | 12 +++++++++++-
 1 file changed, 11 insertions(+), 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 ae03ae7e11..97da2ba5e3 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
@@ -65,10 +65,20 @@ export default function BuildAnchor($log, $filter) {
                  case 'workflow_job':
                      url += `workflows/${obj.id}`;
                      break;
+                 case 'label':
+                     url = null;
+                     break;
                  default:
                      url += resource + 's/' + obj.id + '/';
              }
-             return ' <a href=\"' + url + '\"> ' + $filter('sanitize')(obj.name || obj.username) + ' </a> ';
+
+             const name = $filter('sanitize')(obj.name || obj.username);
+
+             if (url) {
+                return ` <a href=\"${url}\"> ${name} </a> `;
+             }
+
+             return ` <span> ${name} </span> `;
          }
          catch(err){
              $log.debug(err);