NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 03:56:53 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

netbox urls: move to re_path as suggested by @jeremystretch

Browse Source
This commit is contained in:
hellerve 2019-05-27 22:41:10 +02:00
parent b114b9d396
commit 1366730a3f
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/netbox/urls.py
View File

@ -1,17 +1,14 @@
from django.conf import settings from django.conf import settings
from django.conf.urls import include from django.conf.urls import include
from django.urls import path, register_converter from django.urls import path, re_path
from django.views.static import serve from django.views.static import serve
from drf_yasg import openapi from drf_yasg import openapi
from drf_yasg.views import get_schema_view from drf_yasg.views import get_schema_view
from netbox.views import APIRootView, HomeView, SearchView from netbox.views import APIRootView, HomeView, SearchView
from users.views import LoginView, LogoutView from users.views import LoginView, LogoutView
from utilities import converters
from .admin import admin_site from .admin import admin_site
register_converter(converters.JSONOrYAMLConverter, 'json_or_yaml')
schema_view = get_schema_view( schema_view = get_schema_view(
openapi.Info( openapi.Info(
title="NetBox API", title="NetBox API",
@ -56,7 +53,7 @@ _patterns = [
path(r'api/virtualization/', include('virtualization.api.urls')), path(r'api/virtualization/', include('virtualization.api.urls')),
path(r'api/docs/', schema_view.with_ui('swagger'), name='api_docs'), path(r'api/docs/', schema_view.with_ui('swagger'), name='api_docs'),
path(r'api/redoc/', schema_view.with_ui('redoc'), name='api_redocs'), path(r'api/redoc/', schema_view.with_ui('redoc'), name='api_redocs'),
path(r'api/swagger<json_or_yaml:format>', schema_view.without_ui(), name='schema_swagger'), re_path(r'^api/swagger(?P<format>.json|.yaml)$', schema_view.without_ui(), name='schema_swagger'),
# Serving static media in Django to pipe it through LoginRequiredMiddleware # Serving static media in Django to pipe it through LoginRequiredMiddleware
path(r'media/<path:path>', serve, {'document_root': settings.MEDIA_ROOT}), path(r'media/<path:path>', serve, {'document_root': settings.MEDIA_ROOT}),

8
netbox/utilities/converters.py
View File

@ -1,8 +0,0 @@
class JSONOrYAMLConverter:
regex = '.json|.yaml'
def to_python(self, value):
return value
def to_url(self, value):
return value