diff --git a/netbox_dns/urls/contact.py b/netbox_dns/urls/contact.py index 43aabdc5..2914c5c7 100644 --- a/netbox_dns/urls/contact.py +++ b/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//", 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//", ContactView.as_view(), name="contact"), path("contacts//edit/", ContactEditView.as_view(), name="contact_edit"), path( - "contacts//delete/", - ContactDeleteView.as_view(), - name="contact_delete", - ), - path( - "contacts//zones/", - ContactZoneListView.as_view(), - name="contact_zones", - ), - path( - "contacts//journal/", - ObjectJournalView.as_view(), - name="contact_journal", - kwargs={"model": Contact}, + "contacts//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//changelog/", - ObjectChangeLogView.as_view(), - name="contact_changelog", - kwargs={"model": Contact}, + "contacts/delete/", ContactBulkDeleteView.as_view(), name="contact_bulk_delete" ), + path("contacts//", include(get_model_urls("netbox_dns", "contact"))), ] diff --git a/netbox_dns/urls/nameserver.py b/netbox_dns/urls/nameserver.py index 7abc024f..42cd89ce 100644 --- a/netbox_dns/urls/nameserver.py +++ b/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//", 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//", NameServerView.as_view(), name="nameserver"), path( "nameservers//edit", NameServerEditView.as_view(), @@ -46,30 +27,19 @@ name="nameserver_delete", ), path( - "nameservers//contacts/", - NameServerContactsView.as_view(), - name="nameserver_contacts", - ), - path( - "nameservers//journal/", - ObjectJournalView.as_view(), - name="nameserver_journal", - kwargs={"model": NameServer}, - ), - path( - "nameservers//changelog/", - ObjectChangeLogView.as_view(), - name="nameserver_changelog", - kwargs={"model": NameServer}, + "nameservers/import/", + NameServerBulkImportView.as_view(), + name="nameserver_import", ), path( - "nameservers//zones/", - NameServerZoneListView.as_view(), - name="nameserver_zones", + "nameservers/edit/", + NameServerBulkEditView.as_view(), + name="nameserver_bulk_edit", ), path( - "nameservers//soazones/", - NameServerSOAZoneListView.as_view(), - name="nameserver_soa_zones", + "nameservers/delete/", + NameServerBulkDeleteView.as_view(), + name="nameserver_bulk_delete", ), + path("nameservers//", include(get_model_urls("netbox_dns", "nameserver"))), ] diff --git a/netbox_dns/urls/record.py b/netbox_dns/urls/record.py index d172e2f1..701905d2 100644 --- a/netbox_dns/urls/record.py +++ b/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//", RecordView.as_view(), name="record"), path("records/", RecordListView.as_view(), name="record_list"), path("records/add/", RecordEditView.as_view(), name="record_add"), + path("records//edit/", RecordEditView.as_view(), name="record_edit"), + path("records//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//", RecordView.as_view(), name="record"), - path("records//edit/", RecordEditView.as_view(), name="record_edit"), - path("records//delete/", RecordDeleteView.as_view(), name="record_delete"), - path( - "records//contacts/", - RecordContactsView.as_view(), - name="record_contacts", - ), - path( - "records//journal/", - ObjectJournalView.as_view(), - name="record_journal", - kwargs={"model": Record}, - ), - path( - "records//changelog/", - ObjectChangeLogView.as_view(), - name="record_changelog", - kwargs={"model": Record}, - ), + path("records//", include(get_model_urls("netbox_dns", "record"))), path( "managedrecords/", ManagedRecordListView.as_view(), name="managed_record_list" ), diff --git a/netbox_dns/urls/record_template.py b/netbox_dns/urls/record_template.py index c9e5940e..1f9750a1 100644 --- a/netbox_dns/urls/record_template.py +++ b/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//", 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//edit/", + RecordTemplateEditView.as_view(), + name="recordtemplate_edit", + ), + path( + "recordtemplates//delete/", + RecordTemplateDeleteView.as_view(), + name="recordtemplate_delete", + ), path( "recordtemplates/import/", RecordTemplateBulkImportView.as_view(), @@ -38,28 +50,7 @@ name="recordtemplate_bulk_delete", ), path( - "recordtemplates//", RecordTemplateView.as_view(), name="recordtemplate" - ), - path( - "recordtemplates//edit/", - RecordTemplateEditView.as_view(), - name="recordtemplate_edit", - ), - path( - "recordtemplates//delete/", - RecordTemplateDeleteView.as_view(), - name="recordtemplate_delete", - ), - path( - "recordtemplates//journal/", - ObjectJournalView.as_view(), - name="recordtemplate_journal", - kwargs={"model": RecordTemplate}, - ), - path( - "recordtemplates//changelog/", - ObjectChangeLogView.as_view(), - name="recordtemplate_changelog", - kwargs={"model": RecordTemplate}, + "recordtemplates//", + include(get_model_urls("netbox_dns", "recordtemplate")), ), ] diff --git a/netbox_dns/urls/registrar.py b/netbox_dns/urls/registrar.py index dac70917..e5fcd12c 100644 --- a/netbox_dns/urls/registrar.py +++ b/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//", 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//edit/", RegistrarEditView.as_view(), name="registrar_edit" ), path( "registrars/delete/", RegistrarBulkDeleteView.as_view(), name="registrar_bulk_delete", ), - path("registrars//", RegistrarView.as_view(), name="registrar"), path( - "registrars//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//delete/", RegistrarDeleteView.as_view(), name="registrar_delete", ), - path( - "registrars//zones/", - RegistrarZoneListView.as_view(), - name="registrar_zones", - ), - path( - "registrars//journal/", - ObjectJournalView.as_view(), - name="registrar_journal", - kwargs={"model": Registrar}, - ), - path( - "registrars//changelog/", - ObjectChangeLogView.as_view(), - name="registrar_changelog", - kwargs={"model": Registrar}, - ), + path("registrars//", include(get_model_urls("netbox_dns", "registrar"))), ] diff --git a/netbox_dns/urls/view.py b/netbox_dns/urls/view.py index a5720b1d..8d41dc59 100644 --- a/netbox_dns/urls/view.py +++ b/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//", ViewView.as_view(), name="view"), path("views/", ViewListView.as_view(), name="view_list"), path("views/add/", ViewEditView.as_view(), name="view_add"), + path("views//edit/", ViewEditView.as_view(), name="view_edit"), + path("views//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//", ViewView.as_view(), name="view"), - path("views//edit/", ViewEditView.as_view(), name="view_edit"), - path("views//delete/", ViewDeleteView.as_view(), name="view_delete"), - path("views//contacts/", ViewContactsView.as_view(), name="view_contacts"), - path("views//zones/", ViewZoneListView.as_view(), name="view_zones"), - path( - "views//journal/", - ObjectJournalView.as_view(), - name="view_journal", - kwargs={"model": View}, - ), - path( - "views//changelog/", - ObjectChangeLogView.as_view(), - name="view_changelog", - kwargs={"model": View}, - ), + path("views//", include(get_model_urls("netbox_dns", "view"))), ] diff --git a/netbox_dns/urls/zone.py b/netbox_dns/urls/zone.py index ace91710..e2e3fa74 100644 --- a/netbox_dns/urls/zone.py +++ b/netbox_dns/urls/zone.py @@ -1,65 +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 Zone from netbox_dns.views import ( - ZoneListView, ZoneView, - ZoneDeleteView, + ZoneListView, ZoneEditView, + ZoneDeleteView, ZoneBulkImportView, ZoneBulkEditView, ZoneBulkDeleteView, - ZoneContactsView, - ZoneRecordListView, - ZoneManagedRecordListView, - ZoneRegistrationView, - ZoneRFC2317ChildZoneListView, - ZoneChildZoneListView, ) zone_urlpatterns = [ + path("zones//", ZoneView.as_view(), name="zone"), path("zones/", ZoneListView.as_view(), name="zone_list"), path("zones/add/", ZoneEditView.as_view(), name="zone_add"), + path("zones//edit/", ZoneEditView.as_view(), name="zone_edit"), + path("zones//delete/", ZoneDeleteView.as_view(), name="zone_delete"), path("zones/import/", ZoneBulkImportView.as_view(), name="zone_import"), path("zones/edit/", ZoneBulkEditView.as_view(), name="zone_bulk_edit"), path("zones/delete/", ZoneBulkDeleteView.as_view(), name="zone_bulk_delete"), - path("zones//", ZoneView.as_view(), name="zone"), - path("zones//delete/", ZoneDeleteView.as_view(), name="zone_delete"), - path("zones//edit/", ZoneEditView.as_view(), name="zone_edit"), - path("zones//contacts/", ZoneContactsView.as_view(), name="zone_contacts"), - path("zones//records/", ZoneRecordListView.as_view(), name="zone_records"), - path( - "zones//managedrecords/", - ZoneManagedRecordListView.as_view(), - name="zone_managed_records", - ), - path( - "zones//rfc2317childzones/", - ZoneRFC2317ChildZoneListView.as_view(), - name="zone_rfc2317_child_zones", - ), - path( - "zones//childzones/", - ZoneChildZoneListView.as_view(), - name="zone_child_zones", - ), - path( - "zones//registration/", - ZoneRegistrationView.as_view(), - name="zone_registration", - ), - path( - "zones//journal/", - ObjectJournalView.as_view(), - name="zone_journal", - kwargs={"model": Zone}, - ), - path( - "zones//changelog/", - ObjectChangeLogView.as_view(), - name="zone_changelog", - kwargs={"model": Zone}, - ), + path("zones//", include(get_model_urls("netbox_dns", "zone"))), ] diff --git a/netbox_dns/urls/zone_template.py b/netbox_dns/urls/zone_template.py index b7f183da..b1865b51 100644 --- a/netbox_dns/urls/zone_template.py +++ b/netbox_dns/urls/zone_template.py @@ -1,21 +1,31 @@ -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 ZoneTemplate from netbox_dns.views import ( - ZoneTemplateListView, ZoneTemplateView, - ZoneTemplateDeleteView, + ZoneTemplateListView, ZoneTemplateEditView, + ZoneTemplateDeleteView, ZoneTemplateBulkImportView, ZoneTemplateBulkEditView, ZoneTemplateBulkDeleteView, ) zonetemplate_urlpatterns = [ + path("zonetemplates//", ZoneTemplateView.as_view(), name="zonetemplate"), path("zonetemplates/", ZoneTemplateListView.as_view(), name="zonetemplate_list"), path("zonetemplates/add/", ZoneTemplateEditView.as_view(), name="zonetemplate_add"), + path( + "zonetemplates//edit/", + ZoneTemplateEditView.as_view(), + name="zonetemplate_edit", + ), + path( + "zonetemplates//delete/", + ZoneTemplateDeleteView.as_view(), + name="zonetemplate_delete", + ), path( "zonetemplates/import/", ZoneTemplateBulkImportView.as_view(), @@ -31,27 +41,7 @@ ZoneTemplateBulkDeleteView.as_view(), name="zonetemplate_bulk_delete", ), - path("zonetemplates//", ZoneTemplateView.as_view(), name="zonetemplate"), - path( - "zonetemplates//delete/", - ZoneTemplateDeleteView.as_view(), - name="zonetemplate_delete", - ), - path( - "zonetemplates//edit/", - ZoneTemplateEditView.as_view(), - name="zonetemplate_edit", - ), - path( - "zonetemplates//journal/", - ObjectJournalView.as_view(), - name="zonetemplate_journal", - kwargs={"model": ZoneTemplate}, - ), path( - "zonetemplates//changelog/", - ObjectChangeLogView.as_view(), - name="zonetemplate_changelog", - kwargs={"model": ZoneTemplate}, + "zonetemplates//", include(get_model_urls("netbox_dns", "zonetemplate")) ), ] diff --git a/netbox_dns/views/contact.py b/netbox_dns/views/contact.py index 2a14a30b..c4002c2b 100644 --- a/netbox_dns/views/contact.py +++ b/netbox_dns/views/contact.py @@ -23,7 +23,6 @@ "ContactBulkImportView", "ContactBulkEditView", "ContactBulkDeleteView", - "ContactZoneListView", ) diff --git a/netbox_dns/views/nameserver.py b/netbox_dns/views/nameserver.py index a02aea9e..d7c1091c 100644 --- a/netbox_dns/views/nameserver.py +++ b/netbox_dns/views/nameserver.py @@ -16,16 +16,13 @@ __all__ = ( - "NameServerListView", "NameServerView", + "NameServerListView", "NameServerEditView", "NameServerDeleteView", "NameServerBulkEditView", "NameServerBulkImportView", "NameServerBulkDeleteView", - "NameServerZoneListView", - "NameServerSOAZoneListView", - "NameServerContactsView", ) diff --git a/netbox_dns/views/record.py b/netbox_dns/views/record.py index a04777b5..1f607859 100644 --- a/netbox_dns/views/record.py +++ b/netbox_dns/views/record.py @@ -18,15 +18,14 @@ __all__ = ( - "RecordListView", - "ManagedRecordListView", "RecordView", + "RecordListView", "RecordEditView", "RecordDeleteView", "RecordBulkImportView", "RecordBulkEditView", "RecordBulkDeleteView", - "RecordContactsView", + "ManagedRecordListView", ) diff --git a/netbox_dns/views/record_template.py b/netbox_dns/views/record_template.py index cac3b6eb..610d6f16 100644 --- a/netbox_dns/views/record_template.py +++ b/netbox_dns/views/record_template.py @@ -15,8 +15,8 @@ __all__ = ( - "RecordTemplateListView", "RecordTemplateView", + "RecordTemplateListView", "RecordTemplateEditView", "RecordTemplateDeleteView", "RecordTemplateBulkImportView", diff --git a/netbox_dns/views/registrar.py b/netbox_dns/views/registrar.py index e11dedad..4116fd5f 100644 --- a/netbox_dns/views/registrar.py +++ b/netbox_dns/views/registrar.py @@ -21,7 +21,6 @@ "RegistrarBulkImportView", "RegistrarBulkEditView", "RegistrarBulkDeleteView", - "RegistrarZoneListView", ) diff --git a/netbox_dns/views/view.py b/netbox_dns/views/view.py index e8e33b8d..481b0d9b 100644 --- a/netbox_dns/views/view.py +++ b/netbox_dns/views/view.py @@ -1,7 +1,6 @@ from utilities.views import ViewTab, register_model_view from netbox.views import generic -from utilities.views import register_model_view from tenancy.views import ObjectContactsView from netbox_dns.models import View, Zone @@ -18,8 +17,6 @@ "ViewBulkImportView", "ViewBulkEditView", "ViewBulkDeleteView", - "ViewContactsView", - "ViewZoneListView", ) diff --git a/netbox_dns/views/zone.py b/netbox_dns/views/zone.py index ce83a146..6cca16aa 100644 --- a/netbox_dns/views/zone.py +++ b/netbox_dns/views/zone.py @@ -20,19 +20,13 @@ __all__ = ( - "ZoneListView", "ZoneView", + "ZoneListView", "ZoneEditView", "ZoneDeleteView", "ZoneBulkImportView", "ZoneBulkEditView", "ZoneBulkDeleteView", - "ZoneContactsView", - "ZoneRegistrationView", - "ZoneRecordListView", - "ZoneManagedRecordListView", - "ZoneRFC2317ChildZoneListView", - "ZoneChildZoneListView", ) diff --git a/netbox_dns/views/zone_template.py b/netbox_dns/views/zone_template.py index 51937cfa..4ba853e0 100644 --- a/netbox_dns/views/zone_template.py +++ b/netbox_dns/views/zone_template.py @@ -1,5 +1,6 @@ from netbox.views import generic +from netbox_dns.models import ZoneTemplate from netbox_dns.filtersets import ZoneTemplateFilterSet from netbox_dns.forms import ( ZoneTemplateImportForm, @@ -7,13 +8,12 @@ ZoneTemplateFilterForm, ZoneTemplateBulkEditForm, ) -from netbox_dns.models import ZoneTemplate from netbox_dns.tables import ZoneTemplateTable, RecordTemplateDisplayTable __all__ = ( - "ZoneTemplateListView", "ZoneTemplateView", + "ZoneTemplateListView", "ZoneTemplateEditView", "ZoneTemplateDeleteView", "ZoneTemplateBulkImportView",