Prefixes
diff --git a/netbox/tenancy/tables.py b/netbox/tenancy/tables.py
index 2938a4aae..884bdc3df 100644
--- a/netbox/tenancy/tables.py
+++ b/netbox/tenancy/tables.py
@@ -8,7 +8,7 @@ TENANTGROUP_ACTIONS = """
{% if perms.tenancy.change_tenantgroup %}
-
+
{% endif %}
"""
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 6ec984936..0ff4a8049 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -1,7 +1,10 @@
+from django.conf import settings
from django.contrib import messages
from django.contrib.auth import login as auth_login, logout as auth_logout, update_session_auth_hash
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
+from django.contrib.auth.models import update_last_login
+from django.contrib.auth.signals import user_logged_in
from django.http import HttpResponseForbidden, HttpResponseRedirect
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse
@@ -44,6 +47,11 @@ class LoginView(View):
if not is_safe_url(url=redirect_to, allowed_hosts=request.get_host()):
redirect_to = reverse('home')
+ # If maintenance mode is enabled, assume the database is read-only, and disable updating the user's
+ # last_login time upon authentication.
+ if settings.MAINTENANCE_MODE:
+ user_logged_in.disconnect(update_last_login, dispatch_uid='update_last_login')
+
# Authenticate user
auth_login(request, form.get_user())
messages.info(request, "Logged in as {}.".format(request.user))
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index b65a7841b..fbebd09ff 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -21,6 +21,10 @@ class ServiceUnavailable(APIException):
default_detail = "Service temporarily unavailable, please try again later."
+class SerializerNotFound(Exception):
+ pass
+
+
def get_serializer_for_model(model, prefix=''):
"""
Dynamically resolve and return the appropriate serializer for a model.
@@ -32,7 +36,9 @@ def get_serializer_for_model(model, prefix=''):
try:
return dynamic_import(serializer_name)
except AttributeError:
- return None
+ raise SerializerNotFound(
+ "Could not determine serializer for {}.{} with prefix '{}'".format(app_name, model_name, prefix)
+ )
#
@@ -100,6 +106,10 @@ class ChoiceField(Field):
return data
+ @property
+ def choices(self):
+ return self._choices
+
class ContentTypeField(RelatedField):
"""
@@ -110,10 +120,6 @@ class ContentTypeField(RelatedField):
"invalid": "Invalid value. Specify a content type as '
.'.",
}
- # Can't set this as an attribute because it raises an exception when the field is read-only
- def get_queryset(self):
- return ContentType.objects.all()
-
def to_internal_value(self, data):
try:
app_label, model = data.split('.')
@@ -234,9 +240,10 @@ class ModelViewSet(_ModelViewSet):
# exists
request = self.get_serializer_context()['request']
if request.query_params.get('brief', False):
- serializer_class = get_serializer_for_model(self.queryset.model, prefix='Nested')
- if serializer_class is not None:
- return serializer_class
+ try:
+ return get_serializer_for_model(self.queryset.model, prefix='Nested')
+ except SerializerNotFound:
+ pass
# Fall back to the hard-coded serializer class
return self.serializer_class
@@ -256,10 +263,14 @@ class FieldChoicesViewSet(ViewSet):
self._fields = OrderedDict()
for cls, field_list in self.fields:
for field_name in field_list:
+
model_name = cls._meta.verbose_name.lower().replace(' ', '-')
key = ':'.join([model_name, field_name])
+
+ serializer = get_serializer_for_model(cls)()
choices = []
- for k, v in cls._meta.get_field(field_name).choices:
+
+ for k, v in serializer.get_fields()[field_name].choices.items():
if type(v) in [list, tuple]:
for k2, v2 in v:
choices.append({
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index f6cb06abd..6034dd8dc 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -11,7 +11,7 @@ CLUSTERTYPE_ACTIONS = """
{% if perms.virtualization.change_clustertype %}
-
+
{% endif %}
"""
@@ -20,7 +20,7 @@ CLUSTERGROUP_ACTIONS = """
{% if perms.virtualization.change_clustergroup %}
-
+
{% endif %}
"""
diff --git a/netbox/virtualization/tests/test_api.py b/netbox/virtualization/tests/test_api.py
index 91792f8fb..328484a89 100644
--- a/netbox/virtualization/tests/test_api.py
+++ b/netbox/virtualization/tests/test_api.py
@@ -622,7 +622,7 @@ class InterfaceTest(APITestCase):
def test_delete_interface(self):
- url = reverse('dcim-api:interface-detail', kwargs={'pk': self.interface1.pk})
+ url = reverse('virtualization-api:interface-detail', kwargs={'pk': self.interface1.pk})
response = self.client.delete(url, **self.header)
self.assertHttpStatus(response, status.HTTP_204_NO_CONTENT)
diff --git a/requirements.txt b/requirements.txt
index 49e7cf39e..0bc96db8d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django>=2.1.5,<2.2
+Django>=2.2,<2.3
django-cors-headers==2.4.0
django-debug-toolbar==1.11
django-filter==2.0.0
@@ -10,6 +10,7 @@ django-timezone-field==3.0
djangorestframework==3.9.0
drf-yasg[validation]==1.14.0
graphviz==0.10.1
+Jinja2==2.10
Markdown==2.6.11
netaddr==0.7.19
Pillow==5.3.0