Parcourir la source

Fixes #1051: Upgraded django-rest-swagger

Jeremy Stretch il y a 8 ans
Parent
commit
ee11775425
3 fichiers modifiés avec 6 ajouts et 3 suppressions
  1. 4 1
      netbox/netbox/urls.py
  2. 1 1
      netbox/templates/_base.html
  3. 1 1
      requirements.txt

+ 4 - 1
netbox/netbox/urls.py

@@ -1,3 +1,5 @@
+from rest_framework_swagger.views import get_swagger_view
+
 from django.conf import settings
 from django.conf import settings
 from django.conf.urls import include, url
 from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib import admin
@@ -8,6 +10,7 @@ from users.views import login, logout
 
 
 
 
 handler500 = handle_500
 handler500 = handle_500
+swagger_view = get_swagger_view(title='NetBox API')
 
 
 _patterns = [
 _patterns = [
 
 
@@ -36,7 +39,7 @@ _patterns = [
     url(r'^api/ipam/', include('ipam.api.urls')),
     url(r'^api/ipam/', include('ipam.api.urls')),
     url(r'^api/secrets/', include('secrets.api.urls')),
     url(r'^api/secrets/', include('secrets.api.urls')),
     url(r'^api/tenancy/', include('tenancy.api.urls')),
     url(r'^api/tenancy/', include('tenancy.api.urls')),
-    url(r'^api/docs/', include('rest_framework_swagger.urls')),
+    url(r'^api/docs/', swagger_view, name='api_docs'),
 
 
     # Serving static media in Django to pipe it through LoginRequiredMiddleware
     # Serving static media in Django to pipe it through LoginRequiredMiddleware
     url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),
     url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),

+ 1 - 1
netbox/templates/_base.html

@@ -312,7 +312,7 @@
                 <div class="col-xs-4 text-right">
                 <div class="col-xs-4 text-right">
                     <p class="text-muted">
                     <p class="text-muted">
                         <i class="fa fa-fw fa-book text-primary"></i> <a href="http://netbox.readthedocs.io/" target="_blank">Docs</a> &middot;
                         <i class="fa fa-fw fa-book text-primary"></i> <a href="http://netbox.readthedocs.io/" target="_blank">Docs</a> &middot;
-                        <i class="fa fa-fw fa-cloud text-primary"></i> <a href="{% url 'django.swagger.base.view' %}">API</a> &middot;
+                        <i class="fa fa-fw fa-cloud text-primary"></i> <a href="{% url 'api_docs' %}">API</a> &middot;
                         <i class="fa fa-fw fa-code text-primary"></i> <a href="https://github.com/digitalocean/netbox">Code</a> &middot;
                         <i class="fa fa-fw fa-code text-primary"></i> <a href="https://github.com/digitalocean/netbox">Code</a> &middot;
                         <i class="fa fa-fw fa-support text-primary"></i> <a href="https://github.com/digitalocean/netbox/wiki">Help</a>
                         <i class="fa fa-fw fa-support text-primary"></i> <a href="https://github.com/digitalocean/netbox/wiki">Help</a>
                     </p>
                     </p>

+ 1 - 1
requirements.txt

@@ -5,7 +5,7 @@ django-cors-headers>=2.0
 django-debug-toolbar>=1.7
 django-debug-toolbar>=1.7
 django-filter>=1.0.2
 django-filter>=1.0.2
 django-mptt==0.8.7
 django-mptt==0.8.7
-django-rest-swagger==0.3.10
+django-rest-swagger>=2.1.0
 django-tables2>=1.4.0
 django-tables2>=1.4.0
 djangorestframework>=3.6.2
 djangorestframework>=3.6.2
 graphviz>=0.6
 graphviz>=0.6