NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-21 12:52:21 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes #4094: Convert unnecessary regular expressions to strings in URL patterns

Browse Source
This commit is contained in:
Jeremy Stretch
2020-02-05 16:12:48 -05:00
parent b1e78fa3c4
commit a58bbccfd3
16 changed files with 558 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/tenancy/api/urls.py
View File

@@ -15,11 +15,11 @@ router = routers.DefaultRouter()
router.APIRootView = TenancyRootView
# Field choices
router.register(r'_choices', views.TenancyFieldChoicesViewSet, basename='field-choice')
router.register('_choices', views.TenancyFieldChoicesViewSet, basename='field-choice')
# Tenants
router.register(r'tenant-groups', views.TenantGroupViewSet)
router.register(r'tenants', views.TenantViewSet)
router.register('tenant-groups', views.TenantGroupViewSet)
router.register('tenants', views.TenantViewSet)
app_name = 'tenancy-api'
urlpatterns = router.urls

30
netbox/tenancy/urls.py
View File

@@ -8,22 +8,22 @@ app_name = 'tenancy'
urlpatterns = [
# Tenant groups
path(r'tenant-groups/', views.TenantGroupListView.as_view(), name='tenantgroup_list'),
path(r'tenant-groups/add/', views.TenantGroupCreateView.as_view(), name='tenantgroup_add'),
path(r'tenant-groups/import/', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'),
path(r'tenant-groups/delete/', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'),
path(r'tenant-groups/<slug:slug>/edit/', views.TenantGroupEditView.as_view(), name='tenantgroup_edit'),
path(r'tenant-groups/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='tenantgroup_changelog', kwargs={'model': TenantGroup}),
path('tenant-groups/', views.TenantGroupListView.as_view(), name='tenantgroup_list'),
path('tenant-groups/add/', views.TenantGroupCreateView.as_view(), name='tenantgroup_add'),
path('tenant-groups/import/', views.TenantGroupBulkImportView.as_view(), name='tenantgroup_import'),
path('tenant-groups/delete/', views.TenantGroupBulkDeleteView.as_view(), name='tenantgroup_bulk_delete'),
path('tenant-groups/<slug:slug>/edit/', views.TenantGroupEditView.as_view(), name='tenantgroup_edit'),
path('tenant-groups/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='tenantgroup_changelog', kwargs={'model': TenantGroup}),
# Tenants
path(r'tenants/', views.TenantListView.as_view(), name='tenant_list'),
path(r'tenants/add/', views.TenantCreateView.as_view(), name='tenant_add'),
path(r'tenants/import/', views.TenantBulkImportView.as_view(), name='tenant_import'),
path(r'tenants/edit/', views.TenantBulkEditView.as_view(), name='tenant_bulk_edit'),
path(r'tenants/delete/', views.TenantBulkDeleteView.as_view(), name='tenant_bulk_delete'),
path(r'tenants/<slug:slug>/', views.TenantView.as_view(), name='tenant'),
path(r'tenants/<slug:slug>/edit/', views.TenantEditView.as_view(), name='tenant_edit'),
path(r'tenants/<slug:slug>/delete/', views.TenantDeleteView.as_view(), name='tenant_delete'),
path(r'tenants/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='tenant_changelog', kwargs={'model': Tenant}),
path('tenants/', views.TenantListView.as_view(), name='tenant_list'),
path('tenants/add/', views.TenantCreateView.as_view(), name='tenant_add'),
path('tenants/import/', views.TenantBulkImportView.as_view(), name='tenant_import'),
path('tenants/edit/', views.TenantBulkEditView.as_view(), name='tenant_bulk_edit'),
path('tenants/delete/', views.TenantBulkDeleteView.as_view(), name='tenant_bulk_delete'),
path('tenants/<slug:slug>/', views.TenantView.as_view(), name='tenant'),
path('tenants/<slug:slug>/edit/', views.TenantEditView.as_view(), name='tenant_edit'),
path('tenants/<slug:slug>/delete/', views.TenantDeleteView.as_view(), name='tenant_delete'),
path('tenants/<slug:slug>/changelog/', ObjectChangeLogView.as_view(), name='tenant_changelog', kwargs={'model': Tenant}),
]