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

Removing references to 'any' state notifications

Browse Source
This commit is contained in:
beeankha
2019-06-13 10:26:57 -04:00
parent c65e6ba30b
commit c6f1806a23
22 changed files with 39 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,18 +235,16 @@ class JobNotificationMixin(object):
logger.warn("No notification template defined for emitting notification")
notification_templates = None
if notification_templates:
all_notification_templates = set()
if status_str != 'running':
all_notification_templates.update(notification_templates.get('any', []))
notification_template_type = 'any'
elif status_str == 'succeeded':
if status_str == 'succeeded':
notification_template_type = 'success'
elif status_str == 'running':
notification_template_type = 'started'
else:
notification_template_type = 'error'
all_notification_templates.update(notification_templates.get(notification_template_type, []))
all_notification_templates = set(notification_templates.get(notification_template_type, []))
if len(all_notification_templates):
# if status_str != 'running':
# all_notification_templates.update(notification_templates.get('any', []))
try:
(notification_subject, notification_body) = getattr(self, 'build_notification_%s_message' % status_str)()
except AttributeError: