From 24a383c7c16005a8898fef4b5adde742f0ad9615 Mon Sep 17 00:00:00 2001 From: Jim Ladd Date: Tue, 20 Aug 2019 23:24:29 -0700 Subject: [PATCH] Set default messages (for each message type) to null --- awx/main/migrations/0084_v360_token_description.py | 1 + awx/main/models/notifications.py | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/main/migrations/0084_v360_token_description.py b/awx/main/migrations/0084_v360_token_description.py index b360b3e0f8..c93e2021cd 100644 --- a/awx/main/migrations/0084_v360_token_description.py +++ b/awx/main/migrations/0084_v360_token_description.py @@ -2,6 +2,7 @@ from django.db import migrations, models +import awx class Migration(migrations.Migration): diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index 25ad018eb7..cfdc89f4fc 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -73,10 +73,7 @@ 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': ''}} + return {'started': None, 'success': None, 'error': None} messages = JSONField( null=True,