From 8eb14841296c5f703671a8a069850ec1870fd3a4 Mon Sep 17 00:00:00 2001 From: beeankha Date: Fri, 13 Sep 2019 14:15:01 -0400 Subject: [PATCH] Update migration file, change status syntax --- ... => 0090_v360_approval_node_notifications.py} | 2 +- awx/main/models/workflow.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) rename awx/main/migrations/{0088_v360_approval_node_notifications.py => 0090_v360_approval_node_notifications.py} (94%) diff --git a/awx/main/migrations/0088_v360_approval_node_notifications.py b/awx/main/migrations/0090_v360_approval_node_notifications.py similarity index 94% rename from awx/main/migrations/0088_v360_approval_node_notifications.py rename to awx/main/migrations/0090_v360_approval_node_notifications.py index 7c5d0d3062..8b2eb43feb 100644 --- a/awx/main/migrations/0088_v360_approval_node_notifications.py +++ b/awx/main/migrations/0090_v360_approval_node_notifications.py @@ -6,7 +6,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0087_v360_update_credential_injector_help_text'), + ('main', '0089_v360_new_job_event_types'), ] operations = [ diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 59d7ae7f1c..29816be755 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -719,15 +719,15 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin): self.send_approval_notification('running') 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 if self.workflow_job_template is None: return for nt in self.workflow_job_template.notification_templates["approvals"]: 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: - logger.debug("build_notification_message() does not exist") + raise NotImplementedError("build_approval_notification_message() does not exist") # Use kwargs to force late-binding # https://stackoverflow.com/a/3431699/10669572 @@ -738,17 +738,17 @@ class WorkflowApproval(UnifiedJob, JobNotificationMixin): return _func connection.on_commit(send_it()) - def build_notification_message(self, nt, status): + def build_approval_notification_message(self, nt, approval_status): subject = [] workflow_url = urljoin(settings.TOWER_URL_BASE, '/#/workflows/{}'.format(self.workflow_job.id)) 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)) - if status == 'approved': + if approval_status == 'approved': subject.append((' was approved. {}').format(workflow_url)) - if status == 'timed_out': + if approval_status == 'timed_out': subject.append((' has timed out. {}').format(workflow_url)) - elif status == 'denied': + elif approval_status == 'denied': subject.append((' was denied. {}').format(workflow_url)) subject = " ".join(subject) body = self.notification_data()