External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9167 from djj106/devel

Browse Source 
fix workflow url

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-01-26 15:40:56 +00:00
committed by GitHub
parent 9f691a048d c4c1b9799e
commit 6cc3ac2e99
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/notifications.py
View File

@@ -357,7 +357,7 @@ class JobNotificationMixin(object):
'url': 'https://towerhost/#/jobs/playbook/1010', 'url': 'https://towerhost/#/jobs/playbook/1010',
'approval_status': 'approved', 'approval_status': 'approved',
'approval_node_name': 'Approve Me', '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', 'job_metadata': """{'url': 'https://towerhost/$/jobs/playbook/13',
'traceback': '', 'traceback': '',
'status': 'running', 'status': 'running',

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

@@ -620,7 +620,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, '/#/workflows/{}'.format(self.pk)) return urljoin(settings.TOWER_URL_BASE, '/#/jobs/workflow/{}'.format(self.pk))
def notification_data(self): def notification_data(self):
result = super(WorkflowJob, self).notification_data() result = super(WorkflowJob, self).notification_data()
@@ -752,7 +752,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, '/#/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): def _get_parent_field_name(self):
return 'workflow_approval_template' return 'workflow_approval_template'
@@ -840,7 +840,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, '/#/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, return {'approval_status': approval_status,
'approval_node_name': self.workflow_approval_template.name, 'approval_node_name': self.workflow_approval_template.name,
'workflow_url': workflow_url, 'workflow_url': workflow_url,

2
awx/ui_next/src/screens/ActivityStream/ActivityStreamDescription.jsx
View File

@@ -94,7 +94,7 @@ const buildAnchor = (obj, resource, activity) => {
break; break;
} }
case 'workflow_job': case 'workflow_job':
url = `/workflows/${obj.id}/`; url = `/jobs/workflow/${obj.id}/`;
break; break;
case 'label': case 'label':
url = null; url = null;