From c4c1b9799e40610dea41428ce8663046a364fd9a Mon Sep 17 00:00:00 2001
From: djj106 <djj106@gmail.com>
Date: Tue, 26 Jan 2021 08:48:08 -0600
Subject: [PATCH] fix workflow url

Signed-off-by: djj106 <djj106@gmail.com>
---
 awx/main/models/notifications.py                            | 2 +-
 awx/main/models/workflow.py                                 | 6 +++---
 .../screens/ActivityStream/ActivityStreamDescription.jsx    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py
index 33562e7fca..74a9896385 100644
--- a/awx/main/models/notifications.py
+++ b/awx/main/models/notifications.py
@@ -357,7 +357,7 @@ class JobNotificationMixin(object):
                    'url': 'https://towerhost/#/jobs/playbook/1010',
                    'approval_status': 'approved',
                    'approval_node_name': 'Approve Me',
-                   'workflow_url': 'https://towerhost/#/workflows/1010',
+                   'workflow_url': 'https://towerhost/#/jobs/workflow/1010',
                    'job_metadata': """{'url': 'https://towerhost/$/jobs/playbook/13',
  'traceback': '',
  'status': 'running',
diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py
index dd8bc3e894..d9ac8afcf9 100644
--- a/awx/main/models/workflow.py
+++ b/awx/main/models/workflow.py
@@ -620,7 +620,7 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
         return reverse('api:workflow_job_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, '/#/workflows/{}'.format(self.pk))
+        return urljoin(settings.TOWER_URL_BASE, '/#/jobs/workflow/{}'.format(self.pk))
 
     def notification_data(self):
         result = super(WorkflowJob, self).notification_data()
@@ -752,7 +752,7 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
         return None
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, '/#/workflows/{}'.format(self.workflow_job.id))
+        return urljoin(settings.TOWER_URL_BASE, '/#/jobs/workflow/{}'.format(self.workflow_job.id))
 
     def _get_parent_field_name(self):
         return 'workflow_approval_template'
@@ -840,7 +840,7 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
         return (msg, body)
 
     def context(self, approval_status):
-        workflow_url = urljoin(settings.TOWER_URL_BASE, '/#/workflows/{}'.format(self.workflow_job.id))
+        workflow_url = urljoin(settings.TOWER_URL_BASE, '/#/jobs/workflow/{}'.format(self.workflow_job.id))
         return {'approval_status': approval_status,
                 'approval_node_name': self.workflow_approval_template.name,
                 'workflow_url': workflow_url,
diff --git a/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx b/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx
index d933e0c259..517491797a 100644
--- a/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx
+++ b/awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx
@@ -94,7 +94,7 @@ const buildAnchor = (obj, resource, activity) => {
         break;
       }
       case 'workflow_job':
-        url = `/workflows/${obj.id}/`;
+        url = `/jobs/workflow/${obj.id}/`;
         break;
       case 'label':
         url = null;