NPL-286 merge other branch changes

Author: arthanson

netbox_custom_objects/templates/netbox_custom_objects/customobject.html

@@ -73,9 +73,12 @@
     <li class="nav-item">
       <a class="nav-link{% if not tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object.custom_object_type.get_verbose_name }}</a>
     </li>
-
-    {# Include tabs for registered model views #}
-    {% model_view_tabs object %}
+    <li class="nav-item">
+      <a class="nav-link{% if tab == 'journal' %} active{% endif %}" href="{% url 'plugins:netbox_custom_objects:customobject_journal' object.custom_object_type.name object.pk %}">{% trans "Journal" %}</a>
+    </li>
+    <li class="nav-item">
+      <a class="nav-link{% if tab == 'changelog' %} active{% endif %}" href="{% url 'plugins:netbox_custom_objects:customobject_changelog' object.custom_object_type.name object.pk %}">{% trans "Changelog" %}</a>
+    </li>
   </ul>
 {% endblock tabs %}
 
@@ -145,4 +148,4 @@ <h2 class="card-header">{{ field }}</h2>
       {% plugin_full_width_page object %}
     </div>
   </div>
-{% endblock %}
+{% endblock %}

netbox_custom_objects/templates/netbox_custom_objects/object_journal.html

@@ -31,4 +31,4 @@ <h2 class="card-header">{% trans "New Journal Entry" %}</h2>
       </div>
     </div>
   {% endif %}
-{% endblock %} 
+{% endblock %} 

netbox_custom_objects/urls.py

@@ -64,4 +64,14 @@
         views.CustomObjectDeleteView.as_view(),
         name="customobject_delete",
     ),
+    path(
+        "custom_object/<int:pk>/journal/",
+        views.CustomObjectJournalView.as_view(),
+        name="customobject_journal",
+    ),
+    path(
+        "<str:custom_object_type>/<int:pk>/changelog/",
+        views.CustomObjectChangeLogView.as_view(),
+        name="customobject_changelog",
+    ),
 ]

netbox_custom_objects/views.py

@@ -1,16 +1,25 @@
 import django_filters
+from core.models import ObjectChange
+from core.tables import ObjectChangeTable
+from django.contrib.contenttypes.models import ContentType
 from django.contrib.postgres.fields import ArrayField
-from django.db.models import JSONField
+from django.db.models import JSONField, Q
 from django.shortcuts import get_object_or_404, render
 from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
+from django.views.generic import View
 from extras.choices import CustomFieldUIVisibleChoices
+from extras.forms import JournalEntryForm
+from extras.models import JournalEntry
+from extras.tables import JournalEntryTable
 from netbox.filtersets import BaseFilterSet
 from netbox.forms import NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
 from netbox.views import generic
 from netbox.views.generic.mixins import TableMixin
 from utilities.forms import ConfirmationForm
 from utilities.htmx import htmx_partial
-from utilities.views import get_viewname, register_model_view
+from utilities.views import (ConditionalLoginRequiredMixin, ViewTab,
+                             get_viewname, register_model_view)
 
 from netbox_custom_objects.tables import CustomObjectTable
 
@@ -120,7 +129,7 @@ def get_table(self, data, request, bulk_actions=True):
 #
 
 
-@register_model_view(CustomObjectType, 'list', path='', detail=False)
+@register_model_view(CustomObjectType, "list", path="", detail=False)
 class CustomObjectTypeListView(generic.ObjectListView):
     queryset = CustomObjectType.objects.all()
     filterset = filtersets.CustomObjectTypeFilterSet
@@ -146,7 +155,7 @@ def get_extra_context(self, request, instance):
         }
 
 
-@register_model_view(CustomObjectType, 'add', detail=False)
+@register_model_view(CustomObjectType, "add", detail=False)
 @register_model_view(CustomObjectType, "edit")
 class CustomObjectTypeEditView(generic.ObjectEditView):
     queryset = CustomObjectType.objects.all()
@@ -164,6 +173,7 @@ def _get_dependent_objects(self, obj):
         dependent_objects[model] = list(model.objects.all())
         return dependent_objects
 
+
 #
 # Custom Object Type Fields
 #
@@ -177,7 +187,7 @@ class CustomObjectTypeFieldEditView(generic.ObjectEditView):
 
 @register_model_view(CustomObjectTypeField, "delete")
 class CustomObjectTypeFieldDeleteView(generic.ObjectDeleteView):
-    template_name = 'netbox_custom_objects/field_delete.html'
+    template_name = "netbox_custom_objects/field_delete.html"
     queryset = CustomObjectTypeField.objects.all()
 
     def get_return_url(self, request, obj=None):
@@ -195,56 +205,64 @@ def get(self, request, *args, **kwargs):
 
         model = obj.custom_object_type.get_model()
         kwargs = {
-            f'{obj.name}__isnull': False,
+            f"{obj.name}__isnull": False,
         }
         num_dependent_objects = model.objects.filter(**kwargs).count()
 
         # If this is an HTMX request, return only the rendered deletion form as modal content
         if htmx_partial(request):
-            viewname = get_viewname(self.queryset.model, action='delete')
-            form_url = reverse(viewname, kwargs={'pk': obj.pk})
-            return render(request, 'htmx/delete_form.html', {
-                'object': obj,
-                'object_type': self.queryset.model._meta.verbose_name,
-                'form': form,
-                'form_url': form_url,
-                'num_dependent_objects': num_dependent_objects,
-                **self.get_extra_context(request, obj),
-            })
+            viewname = get_viewname(self.queryset.model, action="delete")
+            form_url = reverse(viewname, kwargs={"pk": obj.pk})
+            return render(
+                request,
+                "htmx/delete_form.html",
+                {
+                    "object": obj,
+                    "object_type": self.queryset.model._meta.verbose_name,
+                    "form": form,
+                    "form_url": form_url,
+                    "num_dependent_objects": num_dependent_objects,
+                    **self.get_extra_context(request, obj),
+                },
+            )
 
-        return render(request, self.template_name, {
-            'object': obj,
-            'form': form,
-            'return_url': self.get_return_url(request, obj),
-            'num_dependent_objects': num_dependent_objects,
-            **self.get_extra_context(request, obj),
-        })
+        return render(
+            request,
+            self.template_name,
+            {
+                "object": obj,
+                "form": form,
+                "return_url": self.get_return_url(request, obj),
+                "num_dependent_objects": num_dependent_objects,
+                **self.get_extra_context(request, obj),
+            },
+        )
 
     def _get_dependent_objects(self, obj):
         dependent_objects = super()._get_dependent_objects(obj)
         model = obj.custom_object_type.get_model()
         kwargs = {
-            f'{obj.name}__isnull': False,
+            f"{obj.name}__isnull": False,
         }
         dependent_objects[model] = list(model.objects.filter(**kwargs))
         return dependent_objects
 
 
-@register_model_view(CustomObjectType, 'bulk_import', path='import', detail=False)
+@register_model_view(CustomObjectType, "bulk_import", path="import", detail=False)
 class CustomObjectTypeBulkImportView(generic.BulkImportView):
     queryset = CustomObjectType.objects.all()
     model_form = forms.CustomObjectTypeImportForm
 
 
-@register_model_view(CustomObjectType, 'bulk_edit', path='edit', detail=False)
+@register_model_view(CustomObjectType, "bulk_edit", path="edit", detail=False)
 class CustomObjectTypeBulkEditView(generic.BulkEditView):
     queryset = CustomObjectType.objects.all()
     filterset = filtersets.CustomObjectTypeFilterSet
     table = tables.CustomObjectTypeTable
     form = forms.CustomObjectTypeBulkEditForm
 
 
-@register_model_view(CustomObjectType, 'bulk_delete', path='delete', detail=False)
+@register_model_view(CustomObjectType, "bulk_delete", path="delete", detail=False)
 class CustomObjectTypeBulkDeleteView(generic.BulkDeleteView):
     queryset = CustomObjectType.objects.all()
     filterset = filtersets.CustomObjectTypeFilterSet
@@ -271,8 +289,8 @@ def get_queryset(self, request):
         if self.queryset:
             return self.queryset
         custom_object_type = self.kwargs.get("custom_object_type", None)
-        self.custom_object_type = get_object_or_404(CustomObjectType,
-            name__iexact=custom_object_type
+        self.custom_object_type = get_object_or_404(
+            CustomObjectType, name__iexact=custom_object_type
         )
         model = self.custom_object_type.get_model()
         return model.objects.all()
@@ -354,16 +372,22 @@ class CustomObjectView(generic.ObjectView):
 
     def get_queryset(self, request):
         custom_object_type = self.kwargs.get("custom_object_type", None)
-        object_type = get_object_or_404(CustomObjectType, name__iexact=custom_object_type)
+        object_type = get_object_or_404(
+            CustomObjectType, name__iexact=custom_object_type
+        )
         model = object_type.get_model()
         return model.objects.all()
 
     def get_object(self, **kwargs):
         custom_object_type = self.kwargs.get("custom_object_type", None)
-        object_type = get_object_or_404(CustomObjectType, name__iexact=custom_object_type)
+        object_type = get_object_or_404(
+            CustomObjectType, name__iexact=custom_object_type
+        )
         model = object_type.get_model()
         # Filter out custom_object_type from kwargs for the object lookup
-        lookup_kwargs = {k: v for k, v in self.kwargs.items() if k != "custom_object_type"}
+        lookup_kwargs = {
+            k: v for k, v in self.kwargs.items() if k != "custom_object_type"
+        }
         return get_object_or_404(model.objects.all(), **lookup_kwargs)
 
     def get_extra_context(self, request, instance):
@@ -394,7 +418,9 @@ def get_object(self, **kwargs):
         if self.object:
             return self.object
         custom_object_type = self.kwargs.pop("custom_object_type", None)
-        object_type = get_object_or_404(CustomObjectType, name__iexact=custom_object_type)
+        object_type = get_object_or_404(
+            CustomObjectType, name__iexact=custom_object_type
+        )
         model = object_type.get_model()
         if not self.kwargs.get("pk", None):
             # We're creating a new object
@@ -420,7 +446,9 @@ def get_form(self, model):
         }
 
         # Process custom object type fields (with grouping)
-        for field in self.object.custom_object_type.fields.all().order_by('group_name', 'weight', 'name'):
+        for field in self.object.custom_object_type.fields.all().order_by(
+            "group_name", "weight", "name"
+        ):
             field_type = field_types.FIELD_TYPE_CLASS[field.type]()
             try:
                 field_name = field.name
@@ -454,7 +482,9 @@ def custom_init(self, *args, **kwargs):
             forms.NetBoxModelForm.__init__(self, *args, **kwargs)
             # Set the grouping info as instance attributes from the outer scope
             self.custom_object_type_fields = attrs["custom_object_type_fields"]
-            self.custom_object_type_field_groups = attrs["custom_object_type_field_groups"]
+            self.custom_object_type_field_groups = attrs[
+                "custom_object_type_field_groups"
+            ]
 
         form_class.__init__ = custom_init
 
@@ -479,7 +509,9 @@ def get_object(self, **kwargs):
         if self.object:
             return self.object
         custom_object_type = self.kwargs.pop("custom_object_type", None)
-        object_type = get_object_or_404(CustomObjectType, name__iexact=custom_object_type)
+        object_type = get_object_or_404(
+            CustomObjectType, name__iexact=custom_object_type
+        )
         model = object_type.get_model()
         return get_object_or_404(model.objects.all(), **self.kwargs)