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

Update migration file, change status syntax

Browse Source
This commit is contained in:
beeankha
2019-09-13 14:15:01 -04:00
parent 1ddf9fd1ed
commit 8eb1484129
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/migrations/0088_v360_approval_node_notifications.py → awx/main/migrations/0090_v360_approval_node_notifications.py
View File

@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('main', '0087_v360_update_credential_injector_help_text'), ('main', '0089_v360_new_job_event_types'),
] ]
operations = [ operations = [

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

@@ -719,15 +719,15 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
self.send_approval_notification('running') self.send_approval_notification('running')
return can_start return can_start
def send_approval_notification(self, status): def send_approval_notification(self, approval_status):
from awx.main.tasks import send_notifications # avoid circular import from awx.main.tasks import send_notifications # avoid circular import
if self.workflow_job_template is None: if self.workflow_job_template is None:
return return
for nt in self.workflow_job_template.notification_templates["approvals"]: for nt in self.workflow_job_template.notification_templates["approvals"]:
try: try:
(notification_subject, notification_body) = self.build_notification_message(nt, status) (notification_subject, notification_body) = self.build_approval_notification_message(nt, approval_status)
except Exception: except Exception:
logger.debug("build_notification_message() does not exist") raise NotImplementedError("build_approval_notification_message() does not exist")
# Use kwargs to force late-binding # Use kwargs to force late-binding
# https://stackoverflow.com/a/3431699/10669572 # https://stackoverflow.com/a/3431699/10669572
@@ -738,17 +738,17 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin):
return _func return _func
connection.on_commit(send_it()) connection.on_commit(send_it())
def build_notification_message(self, nt, status): def build_approval_notification_message(self, nt, approval_status):
subject = [] subject = []
workflow_url = urljoin(settings.TOWER_URL_BASE, '/#/workflows/{}'.format(self.workflow_job.id)) workflow_url = urljoin(settings.TOWER_URL_BASE, '/#/workflows/{}'.format(self.workflow_job.id))
subject.append(('The approval node "{}"').format(self.workflow_approval_template.name)) subject.append(('The approval node "{}"').format(self.workflow_approval_template.name))
if status == 'running': if approval_status == 'running':
subject.append((' is running. This node can be approved or denied at: {}').format(workflow_url)) subject.append((' is running. This node can be approved or denied at: {}').format(workflow_url))
if status == 'approved': if approval_status == 'approved':
subject.append((' was approved. {}').format(workflow_url)) subject.append((' was approved. {}').format(workflow_url))
if status == 'timed_out': if approval_status == 'timed_out':
subject.append((' has timed out. {}').format(workflow_url)) subject.append((' has timed out. {}').format(workflow_url))
elif status == 'denied': elif approval_status == 'denied':
subject.append((' was denied. {}').format(workflow_url)) subject.append((' was denied. {}').format(workflow_url))
subject = " ".join(subject) subject = " ".join(subject)
body = self.notification_data() body = self.notification_data()