Просмотр исходного кода

Fixed deprecation warnings from DRF 3.9

Jeremy Stretch 7 лет назад
Родитель
Сommit
516faac73f

+ 1 - 1
netbox/circuits/api/urls.py

@@ -15,7 +15,7 @@ router = routers.DefaultRouter()
 router.APIRootView = CircuitsRootView
 
 # Field choices
-router.register(r'_choices', views.CircuitsFieldChoicesViewSet, base_name='field-choice')
+router.register(r'_choices', views.CircuitsFieldChoicesViewSet, basename='field-choice')
 
 # Providers
 router.register(r'providers', views.ProviderViewSet)

+ 5 - 5
netbox/dcim/api/urls.py

@@ -15,7 +15,7 @@ router = routers.DefaultRouter()
 router.APIRootView = DCIMRootView
 
 # Field choices
-router.register(r'_choices', views.DCIMFieldChoicesViewSet, base_name='field-choice')
+router.register(r'_choices', views.DCIMFieldChoicesViewSet, basename='field-choice')
 
 # Sites
 router.register(r'regions', views.RegionViewSet)
@@ -58,9 +58,9 @@ router.register(r'device-bays', views.DeviceBayViewSet)
 router.register(r'inventory-items', views.InventoryItemViewSet)
 
 # Connections
-router.register(r'console-connections', views.ConsoleConnectionViewSet, base_name='consoleconnections')
-router.register(r'power-connections', views.PowerConnectionViewSet, base_name='powerconnections')
-router.register(r'interface-connections', views.InterfaceConnectionViewSet, base_name='interfaceconnections')
+router.register(r'console-connections', views.ConsoleConnectionViewSet, basename='consoleconnections')
+router.register(r'power-connections', views.PowerConnectionViewSet, basename='powerconnections')
+router.register(r'interface-connections', views.InterfaceConnectionViewSet, basename='interfaceconnections')
 
 # Cables
 router.register(r'cables', views.CableViewSet)
@@ -69,7 +69,7 @@ router.register(r'cables', views.CableViewSet)
 router.register(r'virtual-chassis', views.VirtualChassisViewSet)
 
 # Miscellaneous
-router.register(r'connected-device', views.ConnectedDeviceViewSet, base_name='connected-device')
+router.register(r'connected-device', views.ConnectedDeviceViewSet, basename='connected-device')
 
 app_name = 'dcim-api'
 urlpatterns = router.urls

+ 2 - 2
netbox/extras/api/urls.py

@@ -15,7 +15,7 @@ router = routers.DefaultRouter()
 router.APIRootView = ExtrasRootView
 
 # Field choices
-router.register(r'_choices', views.ExtrasFieldChoicesViewSet, base_name='field-choice')
+router.register(r'_choices', views.ExtrasFieldChoicesViewSet, basename='field-choice')
 
 # Graphs
 router.register(r'graphs', views.GraphViewSet)
@@ -36,7 +36,7 @@ router.register(r'image-attachments', views.ImageAttachmentViewSet)
 router.register(r'config-contexts', views.ConfigContextViewSet)
 
 # Reports
-router.register(r'reports', views.ReportViewSet, base_name='report')
+router.register(r'reports', views.ReportViewSet, basename='report')
 
 # Change logging
 router.register(r'object-changes', views.ObjectChangeViewSet)

+ 1 - 1
netbox/ipam/api/urls.py

@@ -15,7 +15,7 @@ router = routers.DefaultRouter()
 router.APIRootView = IPAMRootView
 
 # Field choices
-router.register(r'_choices', views.IPAMFieldChoicesViewSet, base_name='field-choice')
+router.register(r'_choices', views.IPAMFieldChoicesViewSet, basename='field-choice')
 
 # VRFs
 router.register(r'vrfs', views.VRFViewSet)

+ 3 - 3
netbox/secrets/api/urls.py

@@ -15,15 +15,15 @@ router = routers.DefaultRouter()
 router.APIRootView = SecretsRootView
 
 # Field choices
-router.register(r'_choices', views.SecretsFieldChoicesViewSet, base_name='field-choice')
+router.register(r'_choices', views.SecretsFieldChoicesViewSet, basename='field-choice')
 
 # Secrets
 router.register(r'secret-roles', views.SecretRoleViewSet)
 router.register(r'secrets', views.SecretViewSet)
 
 # Miscellaneous
-router.register(r'get-session-key', views.GetSessionKeyViewSet, base_name='get-session-key')
-router.register(r'generate-rsa-key-pair', views.GenerateRSAKeyPairViewSet, base_name='generate-rsa-key-pair')
+router.register(r'get-session-key', views.GetSessionKeyViewSet, basename='get-session-key')
+router.register(r'generate-rsa-key-pair', views.GenerateRSAKeyPairViewSet, basename='generate-rsa-key-pair')
 
 app_name = 'secrets-api'
 urlpatterns = router.urls

+ 1 - 1
netbox/tenancy/api/urls.py

@@ -15,7 +15,7 @@ router = routers.DefaultRouter()
 router.APIRootView = TenancyRootView
 
 # Field choices
-router.register(r'_choices', views.TenancyFieldChoicesViewSet, base_name='field-choice')
+router.register(r'_choices', views.TenancyFieldChoicesViewSet, basename='field-choice')
 
 # Tenants
 router.register(r'tenant-groups', views.TenantGroupViewSet)

+ 1 - 1
netbox/virtualization/api/urls.py

@@ -15,7 +15,7 @@ router = routers.DefaultRouter()
 router.APIRootView = VirtualizationRootView
 
 # Field choices
-router.register(r'_choices', views.VirtualizationFieldChoicesViewSet, base_name='field-choice')
+router.register(r'_choices', views.VirtualizationFieldChoicesViewSet, basename='field-choice')
 
 # Clusters
 router.register(r'cluster-types', views.ClusterTypeViewSet)