| Model |
- {{ device.device_type }} |
+ {{ device.device_type.full_name }} |
| Serial Number |
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 42cb30f99..0492bd2cc 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -2,7 +2,7 @@
{% load helpers %}
{% load render_table from django_tables2 %}
-{% block title %}{{ devicetype }}{% endblock %}
+{% block title %}{{ devicetype.manufacturer }} {{ devicetype.model }}{% endblock %}
{% block content %}
@@ -32,7 +32,7 @@
{% endif %}
-{{ devicetype }}
+{{ devicetype.manufacturer }} {{ devicetype.model }}
{% endfor %}
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index 1055fb9b3..821f6d7bf 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -28,8 +28,8 @@ class TenantGroupEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'tenancy.change_tenantgroup'
model = TenantGroup
form_class = forms.TenantGroupForm
- success_url = 'tenancy:tenantgroup_list'
- cancel_url = 'tenancy:tenantgroup_list'
+ obj_list_url = 'tenancy:tenantgroup_list'
+ use_obj_view = False
class TenantGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView):
@@ -83,7 +83,7 @@ class TenantEditView(PermissionRequiredMixin, ObjectEditView):
form_class = forms.TenantForm
fields_initial = ['group']
template_name = 'tenancy/tenant_edit.html'
- cancel_url = 'tenancy:tenant_list'
+ obj_list_url = 'tenancy:tenant_list'
class TenantDeleteView(PermissionRequiredMixin, ObjectDeleteView):
diff --git a/netbox/utilities/middleware.py b/netbox/utilities/middleware.py
index e37c1fcca..2bd25b00c 100644
--- a/netbox/utilities/middleware.py
+++ b/netbox/utilities/middleware.py
@@ -2,6 +2,7 @@ from django.http import HttpResponseRedirect
from django.conf import settings
+BASE_PATH = getattr(settings, 'BASE_PATH', False)
LOGIN_REQUIRED = getattr(settings, 'LOGIN_REQUIRED', False)
@@ -11,5 +12,8 @@ class LoginRequiredMiddleware:
"""
def process_request(self, request):
if LOGIN_REQUIRED and not request.user.is_authenticated():
- if request.path_info != settings.LOGIN_URL:
+ # Redirect unauthenticated requests to the login page. API requests are exempt from redirection as the API
+ # performs its own authentication.
+ api_path = '/{}api/'.format(BASE_PATH)
+ if not request.path_info.startswith(api_path) and request.path_info != settings.LOGIN_URL:
return HttpResponseRedirect('{}?next={}'.format(settings.LOGIN_URL, request.path_info))
diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py
index 76d15c331..1b4493281 100644
--- a/netbox/utilities/views.py
+++ b/netbox/utilities/views.py
@@ -119,8 +119,8 @@ class ObjectEditView(View):
form_class = None
fields_initial = []
template_name = 'utilities/obj_edit.html'
- success_url = None
- cancel_url = None
+ obj_list_url = None
+ use_obj_view = True
def get_object(self, kwargs):
# Look up object by slug if one has been provided. Otherwise, use PK.
@@ -129,12 +129,13 @@ class ObjectEditView(View):
else:
return get_object_or_404(self.model, pk=kwargs['pk'])
- def get_cancel_url(self, obj):
- if hasattr(obj, 'get_absolute_url'):
- return obj.get_absolute_url()
- if hasattr(obj, 'get_parent_url'):
- return obj.get_parent_url()
- return reverse(self.cancel_url)
+ def get_redirect_url(self, obj):
+ if obj and self.use_obj_view:
+ if hasattr(obj, 'get_absolute_url'):
+ return obj.get_absolute_url()
+ if hasattr(obj, 'get_parent_url'):
+ return obj.get_parent_url()
+ return reverse(self.obj_list_url)
def get(self, request, *args, **kwargs):
@@ -149,7 +150,7 @@ class ObjectEditView(View):
'obj': obj,
'obj_type': self.model._meta.verbose_name,
'form': form,
- 'cancel_url': self.get_cancel_url(obj),
+ 'cancel_url': self.get_redirect_url(obj),
})
def post(self, request, *args, **kwargs):
@@ -179,18 +180,13 @@ class ObjectEditView(View):
if '_addanother' in request.POST:
return redirect(request.path)
- elif self.success_url:
- return redirect(self.success_url)
- elif hasattr(obj, 'get_absolute_url'):
- return redirect(obj.get_absolute_url())
- elif hasattr(obj, 'get_parent_url'):
- return redirect(obj.get_parent_url())
+ return redirect(self.get_redirect_url(obj))
return render(request, self.template_name, {
'obj': obj,
'obj_type': self.model._meta.verbose_name,
'form': form,
- 'cancel_url': self.get_cancel_url(obj),
+ 'cancel_url': self.get_redirect_url(obj),
})