From 97188ad85ba77d361ae38d8b5e01ae9109e5e9bd Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 6 Oct 2017 15:26:56 -0400 Subject: [PATCH 1/4] Fixes #1563: Made necessary updates for Django REST Framework v3.7.0 --- netbox/netbox/settings.py | 2 +- netbox/utilities/api.py | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 735372b61..437a3ea23 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -228,7 +228,7 @@ REST_FRAMEWORK = { 'utilities.api.TokenAuthentication', ), 'DEFAULT_FILTER_BACKENDS': ( - 'rest_framework.filters.DjangoFilterBackend', + 'django_filters.rest_framework.DjangoFilterBackend', ), 'DEFAULT_PAGINATION_CLASS': 'utilities.api.OptionalLimitOffsetPagination', 'DEFAULT_PERMISSION_CLASSES': ( diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py index 3698bc47c..584b00fc3 100644 --- a/netbox/utilities/api.py +++ b/netbox/utilities/api.py @@ -4,13 +4,12 @@ from django.conf import settings from django.contrib.contenttypes.models import ContentType from rest_framework import authentication, exceptions -from rest_framework.compat import is_authenticated from rest_framework.exceptions import APIException from rest_framework.pagination import LimitOffsetPagination from rest_framework.permissions import BasePermission, DjangoModelPermissions, SAFE_METHODS from rest_framework.renderers import BrowsableAPIRenderer from rest_framework.serializers import Field, ModelSerializer, ValidationError -from rest_framework.views import get_view_name as drf_get_view_name +from rest_framework.utils import formatting from users.models import Token @@ -75,7 +74,7 @@ class IsAuthenticatedOrLoginNotRequired(BasePermission): def has_permission(self, request, view): if not settings.LOGIN_REQUIRED: return True - return request.user and is_authenticated(request.user) + return request.user.is_authenticated() # @@ -228,10 +227,18 @@ def get_view_name(view_cls, suffix=None): Derive the view name from its associated model, if it has one. Fall back to DRF's built-in `get_view_name`. """ if hasattr(view_cls, 'queryset'): + # Determine the model name from the queryset. name = view_cls.queryset.model._meta.verbose_name name = ' '.join([w[0].upper() + w[1:] for w in name.split()]) # Capitalize each word - if suffix: - name = "{} {}".format(name, suffix) - return name - return drf_get_view_name(view_cls, suffix) + else: + # Replicate DRF's built-in behavior. + name = view_cls.__name__ + name = formatting.remove_trailing_string(name, 'View') + name = formatting.remove_trailing_string(name, 'ViewSet') + name = formatting.camelcase_to_spaces(name) + + if suffix: + name += ' ' + suffix + + return name From af2de6776d4eda1ec4006b8856eee0a795d82440 Mon Sep 17 00:00:00 2001 From: huzichunjohn Date: Tue, 10 Oct 2017 01:28:39 +0800 Subject: [PATCH 2/4] Closes #1561: Add Primary IP for a device to Search Results (#1565) --- netbox/netbox/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index d5224b462..ba3730829 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -14,7 +14,7 @@ from circuits.models import Circuit, Provider from circuits.tables import CircuitTable, ProviderTable from dcim.filters import DeviceFilter, DeviceTypeFilter, RackFilter, SiteFilter from dcim.models import ConsolePort, Device, DeviceType, InterfaceConnection, PowerPort, Rack, Site -from dcim.tables import DeviceTable, DeviceTypeTable, RackTable, SiteTable +from dcim.tables import DeviceDetailTable, DeviceTypeTable, RackTable, SiteTable from extras.models import TopologyMap, UserAction from ipam.filters import AggregateFilter, IPAddressFilter, PrefixFilter, VLANFilter, VRFFilter from ipam.models import Aggregate, IPAddress, Prefix, VLAN, VRF @@ -67,7 +67,7 @@ SEARCH_TYPES = OrderedDict(( 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack' ), 'filter': DeviceFilter, - 'table': DeviceTable, + 'table': DeviceDetailTable, 'url': 'dcim:device_list', }), # IPAM From a73e598a6e6db08d93509f2c6bf70fa6b277bb4e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 9 Oct 2017 13:32:30 -0400 Subject: [PATCH 3/4] #1561: Selected related primary IPs for devices under global search --- netbox/netbox/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index ba3730829..72bb8dcec 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -64,7 +64,7 @@ SEARCH_TYPES = OrderedDict(( }), ('device', { 'queryset': Device.objects.select_related( - 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack' + 'device_type__manufacturer', 'device_role', 'tenant', 'site', 'rack', 'primary_ip4', 'primary_ip6', ), 'filter': DeviceFilter, 'table': DeviceDetailTable, From b69bf58c6316dea1fe23cdae476485dff89e9d99 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 9 Oct 2017 13:40:28 -0400 Subject: [PATCH 4/4] Closes #1548: Automatically populate tenant assignment when adding an IP address from the prefix view --- netbox/ipam/tables.py | 2 +- netbox/templates/ipam/inc/prefix_header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 24bb9b3c2..72c760d34 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -71,7 +71,7 @@ IPADDRESS_LINK = """ {% if record.pk %} {{ record.address }} {% elif perms.ipam.add_ipaddress %} - {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available + {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available {% else %} {% if record.0 <= 65536 %}{{ record.0 }}{% else %}Many{% endif %} IP{{ record.0|pluralize }} available {% endif %} diff --git a/netbox/templates/ipam/inc/prefix_header.html b/netbox/templates/ipam/inc/prefix_header.html index 6deb10e57..d9e017860 100644 --- a/netbox/templates/ipam/inc/prefix_header.html +++ b/netbox/templates/ipam/inc/prefix_header.html @@ -23,7 +23,7 @@
{% if perms.ipam.add_ipaddress %} - + Add an IP Address