From 6bec89d46b15a356b0faedc66023fc27a361cc33 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 4 Jul 2024 16:16:00 -0400 Subject: [PATCH] Misc cleanup --- netbox/account/views.py | 4 ++-- netbox/extras/api/views.py | 1 - netbox/extras/migrations/0118_notifications.py | 2 +- netbox/extras/models/notifications.py | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/netbox/account/views.py b/netbox/account/views.py index 6654c0a30..4fb3de840 100644 --- a/netbox/account/views.py +++ b/netbox/account/views.py @@ -276,7 +276,7 @@ class NotificationListView(LoginRequiredMixin, generic.ObjectListView): template_name = 'account/notifications.html' def get_queryset(self, request): - return Notification.objects.filter(user=request.user) + return request.user.notifications.all() def get_extra_context(self, request): return { @@ -289,7 +289,7 @@ class SubscriptionListView(LoginRequiredMixin, generic.ObjectListView): template_name = 'account/subscriptions.html' def get_queryset(self, request): - return Subscription.objects.filter(user=request.user) + return request.user.subscriptions.all() def get_extra_context(self, request): return { diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py index 2e650b561..2369e8f10 100644 --- a/netbox/extras/api/views.py +++ b/netbox/extras/api/views.py @@ -151,7 +151,6 @@ class NotificationViewSet(NetBoxModelViewSet): class NotificationGroupViewSet(NetBoxModelViewSet): - metadata_class = ContentTypeMetadata queryset = NotificationGroup.objects.all() serializer_class = serializers.NotificationGroupSerializer diff --git a/netbox/extras/migrations/0118_notifications.py b/netbox/extras/migrations/0118_notifications.py index b498b8d8f..b66a7deaf 100644 --- a/netbox/extras/migrations/0118_notifications.py +++ b/netbox/extras/migrations/0118_notifications.py @@ -37,7 +37,7 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('object_id', models.PositiveBigIntegerField()), ('object_type', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.contenttype')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subscriptions', to=settings.AUTH_USER_MODEL)), ], options={ 'verbose_name': 'subscription', diff --git a/netbox/extras/models/notifications.py b/netbox/extras/models/notifications.py index a688f8104..067dc28b9 100644 --- a/netbox/extras/models/notifications.py +++ b/netbox/extras/models/notifications.py @@ -176,7 +176,8 @@ class Subscription(models.Model): ) user = models.ForeignKey( to=settings.AUTH_USER_MODEL, - on_delete=models.CASCADE + on_delete=models.CASCADE, + related_name='subscriptions' ) object_type = models.ForeignKey( to='contenttypes.ContentType',