From 2b792573f83a625111b7529b7744be493d5a885e Mon Sep 17 00:00:00 2001 From: Jim Ladd Date: Wed, 14 Aug 2019 13:01:24 -0700 Subject: [PATCH] set messages default --- .../0085_v360_add_notificationtemplate_messages.py | 3 ++- awx/main/models/notifications.py | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/awx/main/migrations/0085_v360_add_notificationtemplate_messages.py b/awx/main/migrations/0085_v360_add_notificationtemplate_messages.py index 388b6d3a0e..72917aff4c 100644 --- a/awx/main/migrations/0085_v360_add_notificationtemplate_messages.py +++ b/awx/main/migrations/0085_v360_add_notificationtemplate_messages.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals from django.db import migrations, models import awx.main.fields +import awx.main.models.notifications class Migration(migrations.Migration): @@ -17,7 +18,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='notificationtemplate', name='messages', - field=awx.main.fields.JSONField(default=dict, + field=awx.main.fields.JSONField(default=awx.main.models.notifications.NotificationTemplate.default_messages, help_text='Optional custom messages for notification template.', null=True, blank=True), diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index e8a157fc10..b3cf738adc 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -72,10 +72,16 @@ class NotificationTemplate(CommonModelNameNotUnique): notification_configuration = JSONField(blank=False) + def default_messages(): + DEFAULT_MSG = "{{ job_friendly_name }} #{{ job.id }} '{{ job.name }}' {{ job.status }}: {{ url }}" + return {'started': { 'message': DEFAULT_MSG, 'body': ''}, + 'success': { 'message': DEFAULT_MSG, 'body': ''}, + 'error': { 'message': DEFAULT_MSG, 'body': ''}} + messages = JSONField( null=True, blank=True, - default=dict, + default=default_messages, help_text=_('Optional custom messages for notification template.')) def has_message(self, condition):