External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-09 23:12:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

update remaining urls for new UI (#15529) (#6699)

Browse Source
This commit is contained in:
Peter Braun 2024-09-15 16:19:51 +02:00 committed by GitHub
parent 0a8e92cab7
commit a1e3919b1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/models/workflow.py
View File

@ -59,6 +59,8 @@ __all__ = [
logger = logging.getLogger('awx.main.models.workflow')
WORKFLOW_BASE_URL = "{}/jobs/workflow/{}"
class WorkflowNodeBase(CreatedModifiedModel, LaunchTimeConfig):
class Meta:
@ -690,7 +692,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, "{}/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 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
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 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
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,