From 07b093dfef6134754735b0eb0495efa7e81f6a49 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@netboxlabs.com>
Date: Fri, 10 Mar 2023 10:23:38 -0500
Subject: [PATCH] Move filtering logic to valid_models() queryset method

---
 docs/release-notes/version-3.4.md      | 1 +
 netbox/extras/api/views.py             | 2 +-
 netbox/extras/models/change_logging.py | 4 ++--
 netbox/extras/querysets.py             | 6 +++---
 netbox/extras/views.py                 | 8 ++++----
 netbox/users/views.py                  | 4 +++-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/release-notes/version-3.4.md b/docs/release-notes/version-3.4.md
index 22c33bb01..7030714f3 100644
--- a/docs/release-notes/version-3.4.md
+++ b/docs/release-notes/version-3.4.md
@@ -105,6 +105,7 @@
 
 ### Bug Fixes
 
+* [#11335](https://github.com/netbox-community/netbox/issues/11335) - Avoid rendering changelog entries referencing models from removed plugins
 * [#11470](https://github.com/netbox-community/netbox/issues/11470) - Avoid raising exception when filtering IPs by an invalid address
 * [#11565](https://github.com/netbox-community/netbox/issues/11565) - Apply custom field defaults to IP address created during FHRP group creation
 * [#11631](https://github.com/netbox-community/netbox/issues/11631) - Fix filtering changelog & journal entries by multiple content type IDs
diff --git a/netbox/extras/api/views.py b/netbox/extras/api/views.py
index 3f796d7f8..f4b5a1433 100644
--- a/netbox/extras/api/views.py
+++ b/netbox/extras/api/views.py
@@ -368,7 +368,7 @@ class ObjectChangeViewSet(ReadOnlyModelViewSet):
     Retrieve a list of recent changes.
     """
     metadata_class = ContentTypeMetadata
-    queryset = ObjectChange.objects.prefetch_related('user')
+    queryset = ObjectChange.objects.valid_models().prefetch_related('user')
     serializer_class = serializers.ObjectChangeSerializer
     filterset_class = filtersets.ObjectChangeFilterSet
 
diff --git a/netbox/extras/models/change_logging.py b/netbox/extras/models/change_logging.py
index 00a8feec7..2cb53ed01 100644
--- a/netbox/extras/models/change_logging.py
+++ b/netbox/extras/models/change_logging.py
@@ -5,7 +5,7 @@ from django.db import models
 from django.urls import reverse
 
 from extras.choices import *
-from ..querysets import ObjectChangeManager
+from ..querysets import ObjectChangeQuerySet
 
 __all__ = (
     'ObjectChange',
@@ -82,7 +82,7 @@ class ObjectChange(models.Model):
         null=True
     )
 
-    objects = ObjectChangeManager()
+    objects = ObjectChangeQuerySet.as_manager()
 
     class Meta:
         ordering = ['-time']
diff --git a/netbox/extras/querysets.py b/netbox/extras/querysets.py
index 165c5abd7..5bee14d9f 100644
--- a/netbox/extras/querysets.py
+++ b/netbox/extras/querysets.py
@@ -155,12 +155,12 @@ class ConfigContextModelQuerySet(RestrictedQuerySet):
         return base_query
 
 
-class ObjectChangeManager(Manager.from_queryset(RestrictedQuerySet)):
+class ObjectChangeQuerySet(RestrictedQuerySet):
 
-    def get_queryset(self):
+    def valid_models(self):
         # Exclude any change records which refer to an instance of a model that's no longer installed. This
         # can happen when a plugin is removed but its data remains in the database, for example.
         content_type_ids = set(
             ct.pk for ct in ContentType.objects.get_for_models(*apps.get_models()).values()
         )
-        return super().get_queryset().filter(changed_object_type_id__in=content_type_ids)
+        return self.filter(changed_object_type_id__in=content_type_ids)
diff --git a/netbox/extras/views.py b/netbox/extras/views.py
index 6cbadf09d..6ba63ab58 100644
--- a/netbox/extras/views.py
+++ b/netbox/extras/views.py
@@ -511,7 +511,7 @@ class ConfigTemplateBulkSyncDataView(generic.BulkSyncDataView):
 #
 
 class ObjectChangeListView(generic.ObjectListView):
-    queryset = ObjectChange.objects.all()
+    queryset = ObjectChange.objects.valid_models()
     filterset = filtersets.ObjectChangeFilterSet
     filterset_form = forms.ObjectChangeFilterForm
     table = tables.ObjectChangeTable
@@ -521,10 +521,10 @@ class ObjectChangeListView(generic.ObjectListView):
 
 @register_model_view(ObjectChange)
 class ObjectChangeView(generic.ObjectView):
-    queryset = ObjectChange.objects.all()
+    queryset = ObjectChange.objects.valid_models()
 
     def get_extra_context(self, request, instance):
-        related_changes = ObjectChange.objects.restrict(request.user, 'view').filter(
+        related_changes = ObjectChange.objects.valid_models().restrict(request.user, 'view').filter(
             request_id=instance.request_id
         ).exclude(
             pk=instance.pk
@@ -534,7 +534,7 @@ class ObjectChangeView(generic.ObjectView):
             orderable=False
         )
 
-        objectchanges = ObjectChange.objects.restrict(request.user, 'view').filter(
+        objectchanges = ObjectChange.objects.valid_models().restrict(request.user, 'view').filter(
             changed_object_type=instance.changed_object_type,
             changed_object_id=instance.changed_object_id,
         )
diff --git a/netbox/users/views.py b/netbox/users/views.py
index a82620914..05648e2e3 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -159,7 +159,9 @@ class ProfileView(LoginRequiredMixin, View):
     def get(self, request):
 
         # Compile changelog table
-        changelog = ObjectChange.objects.restrict(request.user, 'view').filter(user=request.user).prefetch_related(
+        changelog = ObjectChange.objects.valid_models().restrict(request.user, 'view').filter(
+            user=request.user
+        ).prefetch_related(
             'changed_object_type'
         )[:20]
         changelog_table = ObjectChangeTable(changelog)