diff --git a/awx/main/migrations/0037_v320_release.py b/awx/main/migrations/0037_v320_release.py index 550abcfefe..680b003930 100644 --- a/awx/main/migrations/0037_v320_release.py +++ b/awx/main/migrations/0037_v320_release.py @@ -98,4 +98,20 @@ class Migration(migrations.Migration): name='launch_type', field=models.CharField(default=b'manual', max_length=20, editable=False, choices=[(b'manual', 'Manual'), (b'relaunch', 'Relaunch'), (b'callback', 'Callback'), (b'scheduled', 'Scheduled'), (b'dependency', 'Dependency'), (b'workflow', 'Workflow'), (b'sync', 'Sync'), (b'scm', 'SCM Update')]), ), + + # Named URL + migrations.AlterField( + model_name='notificationtemplate', + name='name', + field=models.CharField(max_length=512), + ), + migrations.AlterField( + model_name='notificationtemplate', + name='organization', + field=models.ForeignKey(related_name='notification_templates', to='main.Organization', null=True), + ), + migrations.AlterUniqueTogether( + name='notificationtemplate', + unique_together=set([('organization', 'name')]), + ), ] diff --git a/awx/main/models/notifications.py b/awx/main/models/notifications.py index 267e84afa0..7fd883d155 100644 --- a/awx/main/models/notifications.py +++ b/awx/main/models/notifications.py @@ -27,7 +27,7 @@ logger = logging.getLogger('awx.main.models.notifications') __all__ = ['NotificationTemplate', 'Notification'] -class NotificationTemplate(CommonModel): +class NotificationTemplate(CommonModelNameNotUnique): NOTIFICATION_TYPES = [('email', _('Email'), CustomEmailBackend), ('slack', _('Slack'), SlackBackend), @@ -41,12 +41,13 @@ class NotificationTemplate(CommonModel): class Meta: app_label = 'main' + unique_together = ('organization', 'name') organization = models.ForeignKey( 'Organization', blank=False, null=True, - on_delete=models.SET_NULL, + on_delete=models.CASCADE, related_name='notification_templates', )