Merge pull request #142 from netboxlabs/NPL-386-journal-2

NPL-386 Add journaling support and support NetBox _get_action_url changes

Author: bctiemann

netbox_custom_objects/models.py

@@ -133,6 +133,18 @@ def get_list_url(self):
             kwargs={"custom_object_type": self.custom_object_type.name.lower()},
         )
 
+    @classmethod
+    def _get_viewname(cls, action=None, rest_api=False):
+        if rest_api:
+            return f"plugins-api:netbox_custom_objects:api:customobject_{action}"
+        return f"plugins:netbox_custom_objects:customobject_{action}"
+
+    @classmethod
+    def _get_action_url(cls, action=None, rest_api=False, kwargs=None):
+        if kwargs:
+            kwargs["custom_object_type"] = cls.custom_object_type.name.lower()
+        return reverse(cls._get_viewname(action, rest_api), kwargs=kwargs)
+
 
 class CustomObjectType(PrimaryModel):
     # Class-level cache for generated models

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

@@ -0,0 +1,34 @@
+{% extends base_template %}
+{% load form_helpers %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% render_errors form %}
+
+{% block content %}
+  <div class="card">
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+      {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
+    </div>
+  </div>
+  {% if perms.extras.add_journalentry %}
+    <div class="card">
+      <h2 class="card-header">{% trans "New Journal Entry" %}</h2>
+      <div class="card-body">
+        <form action="{% if form_action %}{{ form_action }}{% else %}{% url 'extras:journalentry_add' %}{% endif %}" method="post" enctype="multipart/form-data">
+          <div class="container">
+            <div class="field-group">
+              {% csrf_token %}
+              {% render_form form %}
+            </div>
+            <div class="col col-md-12 text-end my-3">
+              <a href="{{ object.get_absolute_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
+              <button type="submit" class="btn btn-primary">{% trans "Save" %}</button>
+            </div>
+          </div>
+        </form>
+      </div>
+    </div>
+  {% endif %}
+{% endblock %} 

netbox_custom_objects/urls.py

@@ -21,7 +21,14 @@
         name="customobjecttypefield_add",
     ),
 
-    # Custom Objects1
+    # Journal Entries (must come before custom object patterns)
+    path(
+        "journal-entries/add/",
+        views.CustomJournalEntryEditView.as_view(),
+        name="custom_journalentry_add",
+    ),
+
+    # Custom Objects
     path(
         "<str:custom_object_type>/",
         views.CustomObjectListView.as_view(),
@@ -57,4 +64,14 @@
         views.CustomObjectDeleteView.as_view(),
         name="customobject_delete",
     ),
+    path(
+        "<str:custom_object_type>/<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",
+    ),
 ]