update remaining urls for new UI (#15529)

This commit is contained in:
Peter Braun
2024-09-15 15:31:12 +02:00
committed by GitHub
parent 6fd483698a
commit 1140981c64

View File

@@ -59,6 +59,8 @@ __all__ = [
logger = logging.getLogger('awx.main.models.workflow') logger = logging.getLogger('awx.main.models.workflow')
WORKFLOW_BASE_URL = "{}/jobs/workflow/{}"
class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig): class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig):
class Meta: class Meta:
@@ -690,7 +692,7 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificatio
return reverse('api:workflow_job_detail', kwargs={'pk': self.pk}, request=request) return reverse('api:workflow_job_detail', kwargs={'pk': self.pk}, request=request)
def get_ui_url(self): 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): def notification_data(self):
result = super(WorkflowJob, self).notification_data() result = super(WorkflowJob, self).notification_data()
@@ -873,7 +875,7 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
return None return None
def get_ui_url(self): 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): def _get_parent_field_name(self):
return 'workflow_approval_template' return 'workflow_approval_template'
@@ -986,7 +988,7 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
return (msg, body) return (msg, body)
def context(self, approval_status): 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 { return {
'approval_status': approval_status, 'approval_status': approval_status,
'approval_node_name': self.workflow_approval_template.name, 'approval_node_name': self.workflow_approval_template.name,