Merge pull request #375 from peteeckel/housekeeping/streamline-urls

Use get_model_urls to reduce complexity in URL registration

netbox_dns/urls/contact.py

@@ -1,51 +1,29 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import Contact
 from netbox_dns.views import (
-    ContactListView,
     ContactView,
-    ContactDeleteView,
+    ContactListView,
     ContactEditView,
+    ContactDeleteView,
     ContactBulkImportView,
     ContactBulkEditView,
     ContactBulkDeleteView,
-    ContactZoneListView,
 )
 
 contact_urlpatterns = [
+    path("contacts/<int:pk>/", ContactView.as_view(), name="contact"),
     path("contacts/", ContactListView.as_view(), name="contact_list"),
     path("contacts/add/", ContactEditView.as_view(), name="contact_add"),
-    path("contacts/import/", ContactBulkImportView.as_view(), name="contact_import"),
-    path("contacts/edit/", ContactBulkEditView.as_view(), name="contact_bulk_edit"),
-    path(
-        "contacts/delete/",
-        ContactBulkDeleteView.as_view(),
-        name="contact_bulk_delete",
-    ),
-    path("contacts/<int:pk>/", ContactView.as_view(), name="contact"),
     path("contacts/<int:pk>/edit/", ContactEditView.as_view(), name="contact_edit"),
     path(
-        "contacts/<int:pk>/delete/",
-        ContactDeleteView.as_view(),
-        name="contact_delete",
-    ),
-    path(
-        "contacts/<int:pk>/zones/",
-        ContactZoneListView.as_view(),
-        name="contact_zones",
-    ),
-    path(
-        "contacts/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="contact_journal",
-        kwargs={"model": Contact},
+        "contacts/<int:pk>/delete/", ContactDeleteView.as_view(), name="contact_delete"
     ),
+    path("contacts/import/", ContactBulkImportView.as_view(), name="contact_import"),
+    path("contacts/edit/", ContactBulkEditView.as_view(), name="contact_bulk_edit"),
     path(
-        "contacts/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="contact_changelog",
-        kwargs={"model": Contact},
+        "contacts/delete/", ContactBulkDeleteView.as_view(), name="contact_bulk_delete"
     ),
+    path("contacts/<int:pk>/", include(get_model_urls("netbox_dns", "contact"))),
 ]

netbox_dns/urls/nameserver.py

@@ -1,40 +1,21 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import NameServer
 from netbox_dns.views import (
-    NameServerListView,
     NameServerView,
+    NameServerListView,
     NameServerEditView,
     NameServerDeleteView,
     NameServerBulkImportView,
     NameServerBulkEditView,
     NameServerBulkDeleteView,
-    NameServerZoneListView,
-    NameServerSOAZoneListView,
-    NameServerContactsView,
 )
 
 nameserver_urlpatterns = [
+    path("nameservers/<int:pk>/", NameServerView.as_view(), name="nameserver"),
     path("nameservers/", NameServerListView.as_view(), name="nameserver_list"),
     path("nameservers/add/", NameServerEditView.as_view(), name="nameserver_add"),
-    path(
-        "nameservers/import/",
-        NameServerBulkImportView.as_view(),
-        name="nameserver_import",
-    ),
-    path(
-        "nameservers/edit/",
-        NameServerBulkEditView.as_view(),
-        name="nameserver_bulk_edit",
-    ),
-    path(
-        "nameservers/delete/",
-        NameServerBulkDeleteView.as_view(),
-        name="nameserver_bulk_delete",
-    ),
-    path("nameservers/<int:pk>/", NameServerView.as_view(), name="nameserver"),
     path(
         "nameservers/<int:pk>/edit",
         NameServerEditView.as_view(),
@@ -46,30 +27,19 @@
         name="nameserver_delete",
     ),
     path(
-        "nameservers/<int:pk>/contacts/",
-        NameServerContactsView.as_view(),
-        name="nameserver_contacts",
-    ),
-    path(
-        "nameservers/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="nameserver_journal",
-        kwargs={"model": NameServer},
-    ),
-    path(
-        "nameservers/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="nameserver_changelog",
-        kwargs={"model": NameServer},
+        "nameservers/import/",
+        NameServerBulkImportView.as_view(),
+        name="nameserver_import",
     ),
     path(
-        "nameservers/<int:pk>/zones/",
-        NameServerZoneListView.as_view(),
-        name="nameserver_zones",
+        "nameservers/edit/",
+        NameServerBulkEditView.as_view(),
+        name="nameserver_bulk_edit",
     ),
     path(
-        "nameservers/<int:pk>/soazones/",
-        NameServerSOAZoneListView.as_view(),
-        name="nameserver_soa_zones",
+        "nameservers/delete/",
+        NameServerBulkDeleteView.as_view(),
+        name="nameserver_bulk_delete",
     ),
+    path("nameservers/<int:pk>/", include(get_model_urls("netbox_dns", "nameserver"))),
 ]

netbox_dns/urls/record.py

@@ -1,46 +1,28 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import Record
 from netbox_dns.views import (
-    RecordListView,
     RecordView,
+    RecordListView,
     RecordEditView,
     RecordDeleteView,
     RecordBulkImportView,
     RecordBulkEditView,
     RecordBulkDeleteView,
-    RecordContactsView,
     ManagedRecordListView,
 )
 
 record_urlpatterns = [
+    path("records/<int:pk>/", RecordView.as_view(), name="record"),
     path("records/", RecordListView.as_view(), name="record_list"),
     path("records/add/", RecordEditView.as_view(), name="record_add"),
+    path("records/<int:pk>/edit/", RecordEditView.as_view(), name="record_edit"),
+    path("records/<int:pk>/delete/", RecordDeleteView.as_view(), name="record_delete"),
     path("records/import/", RecordBulkImportView.as_view(), name="record_import"),
     path("records/edit/", RecordBulkEditView.as_view(), name="record_bulk_edit"),
     path("records/delete/", RecordBulkDeleteView.as_view(), name="record_bulk_delete"),
-    path("records/<int:pk>/", RecordView.as_view(), name="record"),
-    path("records/<int:pk>/edit/", RecordEditView.as_view(), name="record_edit"),
-    path("records/<int:pk>/delete/", RecordDeleteView.as_view(), name="record_delete"),
-    path(
-        "records/<int:pk>/contacts/",
-        RecordContactsView.as_view(),
-        name="record_contacts",
-    ),
-    path(
-        "records/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="record_journal",
-        kwargs={"model": Record},
-    ),
-    path(
-        "records/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="record_changelog",
-        kwargs={"model": Record},
-    ),
+    path("records/<int:pk>/", include(get_model_urls("netbox_dns", "record"))),
     path(
         "managedrecords/", ManagedRecordListView.as_view(), name="managed_record_list"
     ),

netbox_dns/urls/record_template.py

@@ -1,11 +1,10 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import RecordTemplate
 from netbox_dns.views import (
-    RecordTemplateListView,
     RecordTemplateView,
+    RecordTemplateListView,
     RecordTemplateEditView,
     RecordTemplateDeleteView,
     RecordTemplateBulkImportView,
@@ -14,6 +13,9 @@
 )
 
 recordtemplate_urlpatterns = [
+    path(
+        "recordtemplates/<int:pk>/", RecordTemplateView.as_view(), name="recordtemplate"
+    ),
     path(
         "recordtemplates/", RecordTemplateListView.as_view(), name="recordtemplate_list"
     ),
@@ -22,6 +24,16 @@
         RecordTemplateEditView.as_view(),
         name="recordtemplate_add",
     ),
+    path(
+        "recordtemplates/<int:pk>/edit/",
+        RecordTemplateEditView.as_view(),
+        name="recordtemplate_edit",
+    ),
+    path(
+        "recordtemplates/<int:pk>/delete/",
+        RecordTemplateDeleteView.as_view(),
+        name="recordtemplate_delete",
+    ),
     path(
         "recordtemplates/import/",
         RecordTemplateBulkImportView.as_view(),
@@ -38,28 +50,7 @@
         name="recordtemplate_bulk_delete",
     ),
     path(
-        "recordtemplates/<int:pk>/", RecordTemplateView.as_view(), name="recordtemplate"
-    ),
-    path(
-        "recordtemplates/<int:pk>/edit/",
-        RecordTemplateEditView.as_view(),
-        name="recordtemplate_edit",
-    ),
-    path(
-        "recordtemplates/<int:pk>/delete/",
-        RecordTemplateDeleteView.as_view(),
-        name="recordtemplate_delete",
-    ),
-    path(
-        "recordtemplates/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="recordtemplate_journal",
-        kwargs={"model": RecordTemplate},
-    ),
-    path(
-        "recordtemplates/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="recordtemplate_changelog",
-        kwargs={"model": RecordTemplate},
+        "recordtemplates/<int:pk>/",
+        include(get_model_urls("netbox_dns", "recordtemplate")),
     ),
 ]

netbox_dns/urls/registrar.py

@@ -1,63 +1,39 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import Registrar
 from netbox_dns.views import (
-    RegistrarListView,
     RegistrarView,
-    RegistrarDeleteView,
+    RegistrarListView,
     RegistrarEditView,
+    RegistrarDeleteView,
     RegistrarBulkImportView,
     RegistrarBulkEditView,
     RegistrarBulkDeleteView,
-    RegistrarZoneListView,
 )
 
 registrar_urlpatterns = [
+    path("registrars/<int:pk>/", RegistrarView.as_view(), name="registrar"),
     path("registrars/", RegistrarListView.as_view(), name="registrar_list"),
     path("registrars/add/", RegistrarEditView.as_view(), name="registrar_add"),
     path(
-        "registrars/import/",
-        RegistrarBulkImportView.as_view(),
-        name="registrar_import",
-    ),
-    path(
-        "registrars/edit/",
-        RegistrarBulkEditView.as_view(),
-        name="registrar_bulk_edit",
+        "registrars/<int:pk>/edit/", RegistrarEditView.as_view(), name="registrar_edit"
     ),
     path(
         "registrars/delete/",
         RegistrarBulkDeleteView.as_view(),
         name="registrar_bulk_delete",
     ),
-    path("registrars/<int:pk>/", RegistrarView.as_view(), name="registrar"),
     path(
-        "registrars/<int:pk>/edit/",
-        RegistrarEditView.as_view(),
-        name="registrar_edit",
+        "registrars/import/", RegistrarBulkImportView.as_view(), name="registrar_import"
+    ),
+    path(
+        "registrars/edit/", RegistrarBulkEditView.as_view(), name="registrar_bulk_edit"
     ),
     path(
         "registrars/<int:pk>/delete/",
         RegistrarDeleteView.as_view(),
         name="registrar_delete",
     ),
-    path(
-        "registrars/<int:pk>/zones/",
-        RegistrarZoneListView.as_view(),
-        name="registrar_zones",
-    ),
-    path(
-        "registrars/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="registrar_journal",
-        kwargs={"model": Registrar},
-    ),
-    path(
-        "registrars/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="registrar_changelog",
-        kwargs={"model": Registrar},
-    ),
+    path("registrars/<int:pk>/", include(get_model_urls("netbox_dns", "registrar"))),
 ]

netbox_dns/urls/view.py

@@ -1,41 +1,25 @@
-from django.urls import path
+from django.urls import include, path
 
-from netbox.views.generic import ObjectChangeLogView, ObjectJournalView
+from utilities.urls import get_model_urls
 
-from netbox_dns.models import View
 from netbox_dns.views import (
-    ViewListView,
     ViewView,
-    ViewDeleteView,
+    ViewListView,
     ViewEditView,
+    ViewDeleteView,
     ViewBulkImportView,
     ViewBulkEditView,
     ViewBulkDeleteView,
-    ViewContactsView,
-    ViewZoneListView,
 )
 
 view_urlpatterns = [
+    path("views/<int:pk>/", ViewView.as_view(), name="view"),
     path("views/", ViewListView.as_view(), name="view_list"),
     path("views/add/", ViewEditView.as_view(), name="view_add"),
+    path("views/<int:pk>/edit/", ViewEditView.as_view(), name="view_edit"),
+    path("views/<int:pk>/delete/", ViewDeleteView.as_view(), name="view_delete"),
     path("views/import/", ViewBulkImportView.as_view(), name="view_import"),
     path("views/edit/", ViewBulkEditView.as_view(), name="view_bulk_edit"),
     path("views/delete/", ViewBulkDeleteView.as_view(), name="view_bulk_delete"),
-    path("views/<int:pk>/", ViewView.as_view(), name="view"),
-    path("views/<int:pk>/edit/", ViewEditView.as_view(), name="view_edit"),
-    path("views/<int:pk>/delete/", ViewDeleteView.as_view(), name="view_delete"),
-    path("views/<int:pk>/contacts/", ViewContactsView.as_view(), name="view_contacts"),
-    path("views/<int:pk>/zones/", ViewZoneListView.as_view(), name="view_zones"),
-    path(
-        "views/<int:pk>/journal/",
-        ObjectJournalView.as_view(),
-        name="view_journal",
-        kwargs={"model": View},
-    ),
-    path(
-        "views/<int:pk>/changelog/",
-        ObjectChangeLogView.as_view(),
-        name="view_changelog",
-        kwargs={"model": View},
-    ),
+    path("views/<int:pk>/", include(get_model_urls("netbox_dns", "view"))),
 ]