update remaining urls for new UI (#15529)

ansible · Sep 15, 2024 · 1140981 · 1140981
1 parent 6fd4836
commit 1140981
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py
@@ -59,6 +59,8 @@
 
 logger = logging.getLogger('awx.main.models.workflow')
 
+WORKFLOW_BASE_URL = "{}/jobs/workflow/{}"
+
 
 class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig):
     class Meta:
@@ -690,7 +692,7 @@ def get_absolute_url(self, request=None):
         return reverse('api:workflow_job_detail', kwargs={'pk': self.pk}, request=request)
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, "{}/jobs/workflow/{}".format(settings.OPTIONAL_UI_URL_PREFIX, self.pk))
+        return urljoin(settings.TOWER_URL_BASE, WORKFLOW_BASE_URL.format(settings.OPTIONAL_UI_URL_PREFIX, self.pk))
 
     def notification_data(self):
         result = super(WorkflowJob, self).notification_data()
@@ -873,7 +875,7 @@ def event_class(self):
         return None
 
     def get_ui_url(self):
-        return urljoin(settings.TOWER_URL_BASE, '/#/jobs/workflow/{}'.format(self.workflow_job.id))
+        return urljoin(settings.TOWER_URL_BASE, WORKFLOW_BASE_URL.format(settings.OPTIONAL_UI_URL_PREFIX, self.workflow_job.id))
 
     def _get_parent_field_name(self):
         return 'workflow_approval_template'
@@ -986,7 +988,7 @@ def build_approval_notification_message(self, nt, approval_status):
         return (msg, body)
 
     def context(self, approval_status):
-        workflow_url = urljoin(settings.TOWER_URL_BASE, '/#/jobs/workflow/{}'.format(self.workflow_job.id))
+        workflow_url = urljoin(settings.TOWER_URL_BASE, WORKFLOW_BASE_URL.format(settings.OPTIONAL_UI_URL_PREFIX, self.workflow_job.id))
         return {
             'approval_status': approval_status,
             'approval_node_name': self.workflow_approval_template.name,