-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #375 from peteeckel/housekeeping/streamline-urls
Use get_model_urls to reduce complexity in URL registration
- Loading branch information
Showing
16 changed files
with
99 additions
and
283 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"))), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"))), | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"))), | ||
] |
Oops, something went wrong.