From 8065d7c1278b5c3d21f4e057a4d340d358f6e35b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 4 Jul 2024 12:50:32 -0400 Subject: [PATCH] Drop 'kind' field from Notification model --- netbox/extras/api/serializers_/notifications.py | 4 ++-- netbox/extras/choices.py | 16 ---------------- netbox/extras/migrations/0118_notifications.py | 1 - netbox/extras/models/notifications.py | 6 ------ 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/netbox/extras/api/serializers_/notifications.py b/netbox/extras/api/serializers_/notifications.py index 348da82d2..6ba7f0284 100644 --- a/netbox/extras/api/serializers_/notifications.py +++ b/netbox/extras/api/serializers_/notifications.py @@ -26,9 +26,9 @@ class NotificationSerializer(ValidatedModelSerializer): class Meta: model = Notification fields = [ - 'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', 'read', 'kind', 'event', + 'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', 'read', 'event', ] - brief_fields = ('id', 'url', 'display', 'object_type', 'object_id', 'user', 'kind', 'event') + brief_fields = ('id', 'url', 'display', 'object_type', 'object_id', 'user', 'event') @extend_schema_field(serializers.JSONField(allow_null=True)) def get_object(self, instance): diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 918d6f5fa..6759f6e90 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -152,22 +152,6 @@ class JournalEntryKindChoices(ChoiceSet): # Notifications # -class NotificationKindChoices(ChoiceSet): - key = 'Notification.kind' - - KIND_INFO = 'info' - KIND_SUCCESS = 'success' - KIND_WARNING = 'warning' - KIND_DANGER = 'danger' - - CHOICES = [ - (KIND_INFO, _('Info'), 'cyan'), - (KIND_SUCCESS, _('Success'), 'green'), - (KIND_WARNING, _('Warning'), 'yellow'), - (KIND_DANGER, _('Danger'), 'red'), - ] - - # TODO: Support dynamic entries from plugins class NotificationEventChoices(ChoiceSet): key = 'Notification.event' diff --git a/netbox/extras/migrations/0118_notifications.py b/netbox/extras/migrations/0118_notifications.py index a6765fa33..cbb32dabc 100644 --- a/netbox/extras/migrations/0118_notifications.py +++ b/netbox/extras/migrations/0118_notifications.py @@ -52,7 +52,6 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('read', models.DateTimeField(null=True)), ('object_id', models.PositiveBigIntegerField()), - ('kind', models.CharField(default='info', max_length=30)), ('event', models.CharField(max_length=30)), ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications', to=settings.AUTH_USER_MODEL)), diff --git a/netbox/extras/models/notifications.py b/netbox/extras/models/notifications.py index 6ad91f0ae..9e5f755e5 100644 --- a/netbox/extras/models/notifications.py +++ b/netbox/extras/models/notifications.py @@ -44,12 +44,6 @@ class Notification(models.Model): ct_field='object_type', fk_field='object_id' ) - kind = models.CharField( - verbose_name=_('kind'), - max_length=30, - choices=NotificationKindChoices, - default=NotificationKindChoices.KIND_INFO - ) event = models.CharField( verbose_name=_('event'), max_length=30,