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

Enable notifications to send at org level, ...

Browse Source 
... and list the URL in body of approval notification messages.
This commit is contained in:
beeankha
2019-10-07 15:34:09 -04:00
parent 5a5b46aea0
commit 02b13fd4ae
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,6 +452,12 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
.filter(workflowjobtemplate_notification_templates_for_approvals__in=[self])) .filter(workflowjobtemplate_notification_templates_for_approvals__in=[self]))
# Get Organization NotificationTemplates # Get Organization NotificationTemplates
if self.organization is not None: if self.organization is not None:
error_notification_templates = set(error_notification_templates + list(base_notification_templates.filter(
organization_notification_templates_for_errors=self.organization)))
started_notification_templates = set(started_notification_templates + list(base_notification_templates.filter(
organization_notification_templates_for_started=self.organization)))
success_notification_templates = set(success_notification_templates + list(base_notification_templates.filter(
organization_notification_templates_for_success=self.organization)))
approval_notification_templates = set(approval_notification_templates + list(base_notification_templates.filter( approval_notification_templates = set(approval_notification_templates + list(base_notification_templates.filter(
organization_notification_templates_for_approvals=self.organization))) organization_notification_templates_for_approvals=self.organization)))
return dict(error=list(error_notification_templates), return dict(error=list(error_notification_templates),
@@ -697,6 +703,9 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
def event_class(self): def event_class(self):
return None return None
def get_ui_url(self):
return urljoin(settings.TOWER_URL_BASE, '/#/workflows/{}'.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'