From c23e3eab344f50374eb318097bb69ee5d7848d3d Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 29 Jun 2023 10:13:17 -0400
Subject: [PATCH] Remove inheritance from ChangeLoggedModel

---
 netbox/extras/api/serializers.py           | 2 +-
 netbox/extras/migrations/0095_bookmarks.py | 7 +++----
 netbox/extras/models/models.py             | 8 ++++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index d551e1e8b..f28a5c411 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -206,7 +206,7 @@ class BookmarkSerializer(ValidatedModelSerializer):
     class Meta:
         model = Bookmark
         fields = [
-            'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', 'last_updated',
+            'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created',
         ]
 
     @extend_schema_field(serializers.JSONField(allow_null=True))
diff --git a/netbox/extras/migrations/0095_bookmarks.py b/netbox/extras/migrations/0095_bookmarks.py
index abc597d3c..54c14c496 100644
--- a/netbox/extras/migrations/0095_bookmarks.py
+++ b/netbox/extras/migrations/0095_bookmarks.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.9 on 2023-06-26 14:27
+# Generated by Django 4.1.9 on 2023-06-29 14:07
 
 from django.conf import settings
 from django.db import migrations, models
@@ -8,8 +8,8 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('contenttypes', '0002_remove_content_type_name'),
         ('extras', '0094_tag_object_types'),
     ]
 
@@ -18,8 +18,7 @@ class Migration(migrations.Migration):
             name='Bookmark',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
-                ('created', models.DateTimeField(auto_now_add=True, null=True)),
-                ('last_updated', models.DateTimeField(auto_now=True, null=True)),
+                ('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.PROTECT, to=settings.AUTH_USER_MODEL)),
diff --git a/netbox/extras/models/models.py b/netbox/extras/models/models.py
index e5b81bce8..20bf87903 100644
--- a/netbox/extras/models/models.py
+++ b/netbox/extras/models/models.py
@@ -1,7 +1,6 @@
 import json
 import urllib.parse
 
-from django.conf import settings
 from django.contrib import admin
 from django.conf import settings
 from django.contrib.contenttypes.fields import GenericForeignKey
@@ -596,10 +595,13 @@ class JournalEntry(CustomFieldsMixin, CustomLinksMixin, TagsMixin, ExportTemplat
         return JournalEntryKindChoices.colors.get(self.kind)
 
 
-class Bookmark(ChangeLoggedModel):
+class Bookmark(models.Model):
     """
     An object bookmarked by a User.
     """
+    created = models.DateTimeField(
+        auto_now_add=True
+    )
     object_type = models.ForeignKey(
         to=ContentType,
         on_delete=models.PROTECT
@@ -614,6 +616,8 @@ class Bookmark(ChangeLoggedModel):
         on_delete=models.PROTECT
     )
 
+    objects = RestrictedQuerySet.as_manager()
+
     class Meta:
         ordering = ('created', 'pk')
         constraints = (