From 77c387a559cd66a0bfa734832041e0764e00ffa6 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 21 Feb 2019 14:45:23 -0500 Subject: [PATCH 01/33] Post-release version bump --- netbox/netbox/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 1d2c9d121..a85a5d78e 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -22,7 +22,7 @@ except ImportError: ) -VERSION = '2.5.7' +VERSION = '2.5.8-dev' BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) From 3ffea432534dce9de6774b38416bd554243aa7b9 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Fri, 22 Feb 2019 07:13:39 -0600 Subject: [PATCH 02/33] Fixes #2923: Changes Site Filter on Provider List to APISelectMultiple --- netbox/circuits/forms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index d481deb54..4deee57c9 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -107,7 +107,7 @@ class ProviderFilterForm(BootstrapMixin, CustomFieldFilterForm): site = FilterChoiceField( queryset=Site.objects.all(), to_field_name='slug', - widget=APISelect( + widget=APISelectMultiple( api_url="/api/dcim/sites/", value_field="slug", ) From 8dfef83f1ab1eec15c7c9345e23af880d29ac5bb Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 22 Feb 2019 12:16:15 -0500 Subject: [PATCH 03/33] Changelog for #2923 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd2943106..b2a5445fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +v2.5.8 (FUTURE) + +## Bug Fixes + +* [#2923](https://github.com/digitalocean/netbox/issues/2923) - Provider filter form's site field should be blank by default + +--- + v2.5.7 (2019-02-21) ## Enhancements @@ -24,6 +32,8 @@ v2.5.7 (2019-02-21) * [#2914](https://github.com/digitalocean/netbox/issues/2914) - Fix empty connected circuit link on device interfaces list * [#2915](https://github.com/digitalocean/netbox/issues/2915) - Fix bulk editing of pass-through ports +--- + v2.5.6 (2019-02-13) ## Enhancements From beff774295b82db0cbe56b09650406f03b528d32 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 26 Feb 2019 16:38:49 -0500 Subject: [PATCH 04/33] Fixes #2705: Fix endpoint grouping in API docs --- CHANGELOG.md | 1 + netbox/netbox/views.py | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2a5445fe..253f54e47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ v2.5.8 (FUTURE) ## Bug Fixes +* [#2705](https://github.com/digitalocean/netbox/issues/2705) - Fix endpoint grouping in API docs * [#2923](https://github.com/digitalocean/netbox/issues/2923) - Provider filter form's site field should be blank by default --- diff --git a/netbox/netbox/views.py b/netbox/netbox/views.py index ff11e3892..837d9473d 100644 --- a/netbox/netbox/views.py +++ b/netbox/netbox/views.py @@ -267,6 +267,7 @@ class SearchView(View): class APIRootView(APIView): _ignore_model_permissions = True exclude_from_schema = True + swagger_schema = None def get_view_name(self): return "API Root" From f2471aedb28b232f926ec3f43dddb981d0d404f9 Mon Sep 17 00:00:00 2001 From: dansheps Date: Wed, 27 Feb 2019 11:39:25 -0600 Subject: [PATCH 05/33] Fixes #2781: Fixes filter by regions on site and device list --- netbox/dcim/filters.py | 17 ++++++++++------- netbox/utilities/filters.py | 9 +++++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index 96ecefafd..b8086322d 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -8,7 +8,9 @@ from netaddr.core import AddrFormatError from extras.filters import CustomFieldFilterSet from tenancy.models import Tenant from utilities.constants import COLOR_CHOICES -from utilities.filters import NameSlugSearchFilterSet, NullableCharFieldFilter, NumericInFilter, TagFilter +from utilities.filters import ( + NameSlugSearchFilterSet, NullableCharFieldFilter, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter +) from virtualization.models import Cluster from .constants import * from .models import ( @@ -49,14 +51,15 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): choices=SITE_STATUS_CHOICES, null_value=None ) - region_id = django_filters.NumberFilter( - method='filter_region', - field_name='pk', + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='region__in', label='Region (ID)', ) - region = django_filters.CharFilter( - method='filter_region', - field_name='slug', + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='region__in', + to_field_name='slug', label='Region (slug)', ) tenant_id = django_filters.ModelMultipleChoiceFilter( diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py index 40e687077..b0c2b3ec3 100644 --- a/netbox/utilities/filters.py +++ b/netbox/utilities/filters.py @@ -4,6 +4,15 @@ from django.db.models import Q from taggit.models import Tag +class TreeNodeMultipleChoiceFilter(django_filters.ModelMultipleChoiceFilter): + """ + Filters for a set of Models, including all descendant models within a Tree. Example: [,] + """ + def filter(self, qs, value): + value = [node.get_descendants(include_self=True) for node in value] + return super().filter(qs, value) + + class NumericInFilter(django_filters.BaseInFilter, django_filters.NumberFilter): """ Filters for a set of numeric values. Example: id__in=100,200,300 From 00aaf500de1ac67bcba46fbcc75d9ea51cf6ddca Mon Sep 17 00:00:00 2001 From: dansheps Date: Wed, 27 Feb 2019 14:46:11 -0600 Subject: [PATCH 06/33] Fixes #2781: Fixes filter by regions on site and device list * Add Device filter --- netbox/dcim/filters.py | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index b8086322d..d06a65ad3 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -98,16 +98,6 @@ class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet): pass return queryset.filter(qs_filter) - def filter_region(self, queryset, name, value): - try: - region = Region.objects.get(**{name: value}) - except ObjectDoesNotExist: - return queryset.none() - return queryset.filter( - Q(region=region) | - Q(region__in=region.get_descendants()) - ) - class RackGroupFilter(NameSlugSearchFilterSet): site_id = django_filters.ModelMultipleChoiceFilter( @@ -516,14 +506,15 @@ class DeviceFilter(CustomFieldFilterSet): ) name = NullableCharFieldFilter() asset_tag = NullableCharFieldFilter() - region_id = django_filters.NumberFilter( - method='filter_region', - field_name='pk', + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='region__in', label='Region (ID)', ) - region = django_filters.CharFilter( - method='filter_region', - field_name='slug', + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='region__in', + to_field_name='slug', label='Region (slug)', ) site_id = django_filters.ModelMultipleChoiceFilter( From 32f63a18ff4f0edf8cd165459cd9da7a13b2dd0f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 28 Feb 2019 09:49:23 -0500 Subject: [PATCH 07/33] Fixes #2938: Enforce deterministic ordering of device components returned by API --- CHANGELOG.md | 1 + netbox/dcim/managers.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 253f54e47..f1c42a976 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ v2.5.8 (FUTURE) * [#2705](https://github.com/digitalocean/netbox/issues/2705) - Fix endpoint grouping in API docs * [#2923](https://github.com/digitalocean/netbox/issues/2923) - Provider filter form's site field should be blank by default +* [#2938](https://github.com/digitalocean/netbox/issues/2938) - Enforce deterministic ordering of device components returned by API --- diff --git a/netbox/dcim/managers.py b/netbox/dcim/managers.py index 52df1afe8..feaa09d74 100644 --- a/netbox/dcim/managers.py +++ b/netbox/dcim/managers.py @@ -27,7 +27,7 @@ class DeviceComponentManager(Manager): select={ 'name_padded': sql.format(table_name, table_name), } - ).order_by('name_padded') + ).order_by('name_padded', 'pk') class InterfaceQuerySet(QuerySet): From 3e6033e9ff0adb7942e420e0d83f6166a1057756 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 28 Feb 2019 09:59:17 -0500 Subject: [PATCH 08/33] Fixes #2938: Exclude circuit terminations from API interface connections endpoint --- CHANGELOG.md | 1 + netbox/dcim/api/views.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1c42a976..82949ff16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ v2.5.8 (FUTURE) * [#2705](https://github.com/digitalocean/netbox/issues/2705) - Fix endpoint grouping in API docs * [#2923](https://github.com/digitalocean/netbox/issues/2923) - Provider filter form's site field should be blank by default * [#2938](https://github.com/digitalocean/netbox/issues/2938) - Enforce deterministic ordering of device components returned by API +* [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint --- diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 4e14d8163..8fddc7129 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -496,11 +496,11 @@ class PowerConnectionViewSet(ListModelMixin, GenericViewSet): class InterfaceConnectionViewSet(ListModelMixin, GenericViewSet): queryset = Interface.objects.select_related( - 'device', '_connected_interface', '_connected_circuittermination' + 'device', '_connected_interface__device' ).filter( # Avoid duplicate connections by only selecting the lower PK in a connected pair - Q(_connected_interface__isnull=False, pk__lt=F('_connected_interface')) | - Q(_connected_circuittermination__isnull=False) + _connected_interface__isnull=False, + pk__lt=F('_connected_interface') ) serializer_class = serializers.InterfaceConnectionSerializer filterset_class = filters.InterfaceConnectionFilter From 6f5c35c2781a1dab157313b1ef87de2ae8de92be Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 28 Feb 2019 11:40:32 -0500 Subject: [PATCH 09/33] Force resolution of request User object when logging an object deletion (resolves intermittent test failures) --- netbox/extras/middleware.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/extras/middleware.py b/netbox/extras/middleware.py index 16461c32a..38dde6275 100644 --- a/netbox/extras/middleware.py +++ b/netbox/extras/middleware.py @@ -29,7 +29,11 @@ def cache_changed_object(instance, **kwargs): def _record_object_deleted(request, instance, **kwargs): - # Record that the object was deleted. + # Force resolution of request.user in case it's still a SimpleLazyObject. This seems to happen + # occasionally during tests, but haven't been able to determine why. + assert request.user.is_authenticated + + # Record that the object was deleted if hasattr(instance, 'log_change'): instance.log_change(request.user, request.id, OBJECTCHANGE_ACTION_DELETE) From b381bdec271167641718c472b78167e50622454f Mon Sep 17 00:00:00 2001 From: John Anderson Date: Sun, 3 Mar 2019 18:52:57 -0500 Subject: [PATCH 10/33] fixes #2952 - slug field absent from TenantFilter --- CHANGELOG.md | 1 + netbox/tenancy/filters.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82949ff16..82df28edc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ v2.5.8 (FUTURE) * [#2923](https://github.com/digitalocean/netbox/issues/2923) - Provider filter form's site field should be blank by default * [#2938](https://github.com/digitalocean/netbox/issues/2938) - Enforce deterministic ordering of device components returned by API * [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint +* [#2952](https://github.com/digitalocean/netbox/issues/2952) - Added the `slug` field to the Tenant filter for use in the API and search function --- diff --git a/netbox/tenancy/filters.py b/netbox/tenancy/filters.py index 745391898..2610b3ec0 100644 --- a/netbox/tenancy/filters.py +++ b/netbox/tenancy/filters.py @@ -36,13 +36,14 @@ class TenantFilter(CustomFieldFilterSet, django_filters.FilterSet): class Meta: model = Tenant - fields = ['name'] + fields = ['name', 'slug'] def search(self, queryset, name, value): if not value.strip(): return queryset return queryset.filter( Q(name__icontains=value) | + Q(slug__icontains=value) | Q(description__icontains=value) | Q(comments__icontains=value) ) From 4d18d9661b641b60a7da94671bbd3cb625e036f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=20V=C3=AEjdea?= Date: Mon, 4 Mar 2019 03:20:47 +0200 Subject: [PATCH 11/33] Remove trailing slashes from filesystem paths Paths with trailing slashes do not work on windows, they cause errors such as `django.core.exceptions.SuspiciousFileOperation: The joined path (C:\Projects\netbox\netbox\static\clipboard-2.0.4.min.js) is located outside of the base path component (C:\Projects\netbox\netbox\static\)`. --- netbox/netbox/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index a85a5d78e..c2622998f 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -197,7 +197,7 @@ ROOT_URLCONF = 'netbox.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR + '/templates/'], + 'DIRS': [BASE_DIR + '/templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -223,7 +223,7 @@ USE_I18N = True USE_TZ = True # Static files (CSS, JavaScript, Images) -STATIC_ROOT = BASE_DIR + '/static/' +STATIC_ROOT = BASE_DIR + '/static' STATIC_URL = '/{}static/'.format(BASE_PATH) STATICFILES_DIRS = ( os.path.join(BASE_DIR, "project-static"), From 3a62e9a3227d2899613f2873469b82a0dd488bed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=20V=C3=AEjdea?= Date: Mon, 4 Mar 2019 03:24:45 +0200 Subject: [PATCH 12/33] Resolve drf-yasg `ref_name` conflicts This solves the problem of distinct serializers being confused because they have the same class name (e.g. `InterfaceSerializer`) Fixes #2065. --- netbox/utilities/custom_inspectors.py | 22 +++++++++++++++++++++- requirements.txt | 2 +- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/netbox/utilities/custom_inspectors.py b/netbox/utilities/custom_inspectors.py index 5975788bc..577e3c202 100644 --- a/netbox/utilities/custom_inspectors.py +++ b/netbox/utilities/custom_inspectors.py @@ -1,14 +1,24 @@ from drf_yasg import openapi from drf_yasg.inspectors import FieldInspector, NotHandled, PaginatorInspector, FilterInspector, SwaggerAutoSchema +from drf_yasg.utils import get_serializer_ref_name from rest_framework.fields import ChoiceField from rest_framework.relations import ManyRelatedField from taggit_serializer.serializers import TagListSerializerField +from dcim.api.serializers import InterfaceSerializer as DCIMInterfaceSerializer +from virtualization.api.serializers import InterfaceSerializer as VirtualMachineInterfaceSerializer from extras.api.customfields import CustomFieldsSerializer from utilities.api import ChoiceField, SerializedPKRelatedField, WritableNestedSerializer +# this might be ugly, but it limits drf_yasg-specific code to this file +DCIMInterfaceSerializer.Meta.ref_name = 'DCIMInterface' +VirtualMachineInterfaceSerializer.Meta.ref_name = 'VirtualMachineInterface' + + class NetBoxSwaggerAutoSchema(SwaggerAutoSchema): + writable_serializers = {} + def get_request_serializer(self): serializer = super().get_request_serializer() @@ -21,7 +31,17 @@ class NetBoxSwaggerAutoSchema(SwaggerAutoSchema): properties[child_name] = None if properties: - writable_class = type('Writable' + type(serializer).__name__, (type(serializer),), properties) + if type(serializer) not in self.writable_serializers: + writable_name = 'Writable' + type(serializer).__name__ + meta_class = getattr(type(serializer), 'Meta', None) + if meta_class: + ref_name = 'Writable' + get_serializer_ref_name(serializer) + writable_meta = type('Meta', (meta_class,), {'ref_name': ref_name}) + properties['Meta'] = writable_meta + + self.writable_serializers[type(serializer)] = type(writable_name, (type(serializer),), properties) + + writable_class = self.writable_serializers[type(serializer)] serializer = writable_class() return serializer diff --git a/requirements.txt b/requirements.txt index e313e9a69..49e7cf39e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ django-taggit==0.23.0 django-taggit-serializer==0.1.7 django-timezone-field==3.0 djangorestframework==3.9.0 -drf-yasg[validation]==1.11.1 +drf-yasg[validation]==1.14.0 graphviz==0.10.1 Markdown==2.6.11 netaddr==0.7.19 From 78725b8483a6920620f5125ccb8fdd2a07d48218 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 4 Mar 2019 14:57:35 -0500 Subject: [PATCH 13/33] Follow-up from #2781 --- CHANGELOG.md | 1 + netbox/dcim/filters.py | 15 ++------------- netbox/virtualization/filters.py | 25 ++++++++----------------- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82df28edc..a2acd88dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ v2.5.8 (FUTURE) ## Bug Fixes * [#2705](https://github.com/digitalocean/netbox/issues/2705) - Fix endpoint grouping in API docs +* [#2781](https://github.com/digitalocean/netbox/issues/2781) - Fix filtering of sites/devices/VMs by multiple regions * [#2923](https://github.com/digitalocean/netbox/issues/2923) - Provider filter form's site field should be blank by default * [#2938](https://github.com/digitalocean/netbox/issues/2938) - Enforce deterministic ordering of device components returned by API * [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py index d06a65ad3..dda904f1c 100644 --- a/netbox/dcim/filters.py +++ b/netbox/dcim/filters.py @@ -1,6 +1,5 @@ import django_filters from django.contrib.auth.models import User -from django.core.exceptions import ObjectDoesNotExist from django.db.models import Q from netaddr import EUI from netaddr.core import AddrFormatError @@ -508,12 +507,12 @@ class DeviceFilter(CustomFieldFilterSet): asset_tag = NullableCharFieldFilter() region_id = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='region__in', + field_name='site__region__in', label='Region (ID)', ) region = TreeNodeMultipleChoiceFilter( queryset=Region.objects.all(), - field_name='region__in', + field_name='site__region__in', to_field_name='slug', label='Region (slug)', ) @@ -613,16 +612,6 @@ class DeviceFilter(CustomFieldFilterSet): Q(comments__icontains=value) ).distinct() - def filter_region(self, queryset, name, value): - try: - region = Region.objects.get(**{name: value}) - except ObjectDoesNotExist: - return queryset.none() - return queryset.filter( - Q(site__region=region) | - Q(site__region__in=region.get_descendants()) - ) - def _mac_address(self, queryset, name, value): value = value.strip() if not value: diff --git a/netbox/virtualization/filters.py b/netbox/virtualization/filters.py index 0b7e57ba7..0e5ff6cd2 100644 --- a/netbox/virtualization/filters.py +++ b/netbox/virtualization/filters.py @@ -7,7 +7,7 @@ from netaddr.core import AddrFormatError from dcim.models import DeviceRole, Interface, Platform, Region, Site from extras.filters import CustomFieldFilterSet from tenancy.models import Tenant -from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter +from utilities.filters import NameSlugSearchFilterSet, NumericInFilter, TagFilter, TreeNodeMultipleChoiceFilter from .constants import VM_STATUS_CHOICES from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine @@ -119,14 +119,15 @@ class VirtualMachineFilter(CustomFieldFilterSet): queryset=Cluster.objects.all(), label='Cluster (ID)', ) - region_id = django_filters.NumberFilter( - method='filter_region', - field_name='pk', + region_id = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='cluster__site__region__in', label='Region (ID)', ) - region = django_filters.CharFilter( - method='filter_region', - field_name='slug', + region = TreeNodeMultipleChoiceFilter( + queryset=Region.objects.all(), + field_name='cluster__site__region__in', + to_field_name='slug', label='Region (slug)', ) site_id = django_filters.ModelMultipleChoiceFilter( @@ -184,16 +185,6 @@ class VirtualMachineFilter(CustomFieldFilterSet): Q(comments__icontains=value) ) - def filter_region(self, queryset, name, value): - try: - region = Region.objects.get(**{name: value}) - except ObjectDoesNotExist: - return queryset.none() - return queryset.filter( - Q(cluster__site__region=region) | - Q(cluster__site__region__in=region.get_descendants()) - ) - class InterfaceFilter(django_filters.FilterSet): q = django_filters.CharFilter( From 0c142f207832cb563bed654fd21bcda0bb7aff59 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 4 Mar 2019 15:16:35 -0500 Subject: [PATCH 14/33] Changelog for #2954 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2acd88dc..d96ca2ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ v2.5.8 (FUTURE) * [#2938](https://github.com/digitalocean/netbox/issues/2938) - Enforce deterministic ordering of device components returned by API * [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint * [#2952](https://github.com/digitalocean/netbox/issues/2952) - Added the `slug` field to the Tenant filter for use in the API and search function +* [#2954](https://github.com/digitalocean/netbox/issues/2954) - Remove trailing slashes to fix root/template paths on Windows --- From bd65e782bba0a1e84c96aa7257780d766c05648c Mon Sep 17 00:00:00 2001 From: Anthony Ruhier Date: Tue, 5 Mar 2019 18:44:44 +0100 Subject: [PATCH 15/33] Allow nullable length unit in cable API Cables models define it as None by default, but the API rejects a request containing a null length_unit. Allows it in the API serializer. --- netbox/dcim/api/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/dcim/api/serializers.py b/netbox/dcim/api/serializers.py index c17400a35..4c65a3a19 100644 --- a/netbox/dcim/api/serializers.py +++ b/netbox/dcim/api/serializers.py @@ -507,7 +507,7 @@ class CableSerializer(ValidatedModelSerializer): termination_a = serializers.SerializerMethodField(read_only=True) termination_b = serializers.SerializerMethodField(read_only=True) status = ChoiceField(choices=CONNECTION_STATUS_CHOICES, required=False) - length_unit = ChoiceField(choices=CABLE_LENGTH_UNIT_CHOICES, required=False) + length_unit = ChoiceField(choices=CABLE_LENGTH_UNIT_CHOICES, required=False, allow_null=True) class Meta: model = Cable From cfb56f7cfee9ad64d3b272ee4f85e44091b8e506 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 5 Mar 2019 13:08:40 -0500 Subject: [PATCH 16/33] Fixes #2962: Increase ExportTemplate mime_type field length --- CHANGELOG.md | 1 + .../0017_exporttemplate_mime_type_length.py | 18 ++++++++++++++++++ netbox/extras/models.py | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 netbox/extras/migrations/0017_exporttemplate_mime_type_length.py diff --git a/CHANGELOG.md b/CHANGELOG.md index d96ca2ad7..3a436d546 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ v2.5.8 (FUTURE) * [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint * [#2952](https://github.com/digitalocean/netbox/issues/2952) - Added the `slug` field to the Tenant filter for use in the API and search function * [#2954](https://github.com/digitalocean/netbox/issues/2954) - Remove trailing slashes to fix root/template paths on Windows +* [#2962](https://github.com/digitalocean/netbox/issues/2962) - Increase ExportTemplate `mime_type` field length --- diff --git a/netbox/extras/migrations/0017_exporttemplate_mime_type_length.py b/netbox/extras/migrations/0017_exporttemplate_mime_type_length.py new file mode 100644 index 000000000..29283e0d1 --- /dev/null +++ b/netbox/extras/migrations/0017_exporttemplate_mime_type_length.py @@ -0,0 +1,18 @@ +# Generated by Django 2.1.7 on 2019-03-05 18:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0016_exporttemplate_add_cable'), + ] + + operations = [ + migrations.AlterField( + model_name='exporttemplate', + name='mime_type', + field=models.CharField(blank=True, max_length=50), + ), + ] diff --git a/netbox/extras/models.py b/netbox/extras/models.py index d3b9f4eff..1b106a62a 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -357,7 +357,7 @@ class ExportTemplate(models.Model): ) template_code = models.TextField() mime_type = models.CharField( - max_length=15, + max_length=50, blank=True ) file_extension = models.CharField( From 6406e213bdcc0c5babf221d70293fe2270f78961 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 5 Mar 2019 13:15:09 -0500 Subject: [PATCH 17/33] Fixes #2961: Prevent exception when exporting inventory items belonging to unnamed devices --- CHANGELOG.md | 1 + netbox/dcim/models.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a436d546..89634c1c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ v2.5.8 (FUTURE) * [#2939](https://github.com/digitalocean/netbox/issues/2939) - Exclude circuit terminations from API interface connections endpoint * [#2952](https://github.com/digitalocean/netbox/issues/2952) - Added the `slug` field to the Tenant filter for use in the API and search function * [#2954](https://github.com/digitalocean/netbox/issues/2954) - Remove trailing slashes to fix root/template paths on Windows +* [#2961](https://github.com/digitalocean/netbox/issues/2961) - Prevent exception when exporting inventory items belonging to unnamed devices * [#2962](https://github.com/digitalocean/netbox/issues/2962) - Increase ExportTemplate `mime_type` field length --- diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index 49879beb1..8133cbfb4 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -2423,7 +2423,7 @@ class InventoryItem(ComponentModel): def to_csv(self): return ( - self.device.name or '{' + self.device.pk + '}', + self.device.name or '{{{}}}'.format(self.device.pk), self.name, self.manufacturer.name if self.manufacturer else None, self.part_id, From 7294f43fa3601a59d4a80fcb35958290ffbfe1f7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 5 Mar 2019 13:18:56 -0500 Subject: [PATCH 18/33] Changelog for #2966 --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89634c1c0..6a4e4b721 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ v2.5.8 (FUTURE) * [#2954](https://github.com/digitalocean/netbox/issues/2954) - Remove trailing slashes to fix root/template paths on Windows * [#2961](https://github.com/digitalocean/netbox/issues/2961) - Prevent exception when exporting inventory items belonging to unnamed devices * [#2962](https://github.com/digitalocean/netbox/issues/2962) - Increase ExportTemplate `mime_type` field length +* [#2966](https://github.com/digitalocean/netbox/issues/2966) - Accept `null` cable length_unit via API --- From c208d8fc2e43b811ea7ffb8068ff8298bb1230b0 Mon Sep 17 00:00:00 2001 From: dansheps Date: Tue, 5 Mar 2019 15:42:47 -0600 Subject: [PATCH 19/33] * Added CSS to: * Hide URLs * Hide elements with "noprint" class * Added noprint to: * Header Panel * Search Panel, Tags Panel * Buttons * Various list elements * Related elements --- netbox/circuits/tables.py | 2 +- netbox/dcim/tables.py | 16 +++++----- netbox/extras/tables.py | 2 +- netbox/ipam/tables.py | 8 ++--- netbox/project-static/css/base.css | 17 +++++++++++ netbox/secrets/tables.py | 2 +- netbox/templates/_base.html | 2 +- netbox/templates/circuits/circuit.html | 4 +-- netbox/templates/circuits/circuit_list.html | 4 +-- .../templates/circuits/circuittype_list.html | 2 +- netbox/templates/circuits/provider.html | 6 ++-- netbox/templates/circuits/provider_list.html | 4 +-- netbox/templates/dcim/cable.html | 4 +-- netbox/templates/dcim/cable_list.html | 4 +-- .../dcim/console_connections_list.html | 4 +-- netbox/templates/dcim/device.html | 30 +++++++++---------- netbox/templates/dcim/device_inventory.html | 2 +- netbox/templates/dcim/device_list.html | 4 +-- netbox/templates/dcim/devicerole_list.html | 2 +- netbox/templates/dcim/devicetype.html | 4 +-- netbox/templates/dcim/devicetype_list.html | 4 +-- netbox/templates/dcim/inc/consoleport.html | 2 +- .../templates/dcim/inc/consoleserverport.html | 2 +- netbox/templates/dcim/inc/devicebay.html | 2 +- .../dcim/inc/devicetype_component_table.html | 2 +- netbox/templates/dcim/inc/frontport.html | 2 +- netbox/templates/dcim/inc/interface.html | 4 +-- netbox/templates/dcim/inc/inventoryitem.html | 2 +- netbox/templates/dcim/inc/poweroutlet.html | 2 +- netbox/templates/dcim/inc/powerport.html | 2 +- netbox/templates/dcim/inc/rearport.html | 2 +- netbox/templates/dcim/interface.html | 4 +-- .../dcim/interface_connections_list.html | 4 +-- netbox/templates/dcim/inventoryitem_list.html | 4 +-- netbox/templates/dcim/manufacturer_list.html | 2 +- netbox/templates/dcim/platform_list.html | 2 +- .../dcim/power_connections_list.html | 4 +-- netbox/templates/dcim/rack.html | 12 ++++---- .../templates/dcim/rack_elevation_list.html | 4 +-- netbox/templates/dcim/rack_list.html | 4 +-- netbox/templates/dcim/rackgroup_list.html | 4 +-- .../templates/dcim/rackreservation_list.html | 2 +- netbox/templates/dcim/rackrole_list.html | 2 +- netbox/templates/dcim/region_list.html | 4 +-- netbox/templates/dcim/site.html | 12 ++++---- netbox/templates/dcim/site_list.html | 4 +-- .../templates/dcim/virtualchassis_list.html | 4 +-- netbox/templates/extras/configcontext.html | 4 +-- .../templates/extras/configcontext_list.html | 4 +-- netbox/templates/extras/objectchange.html | 4 +-- .../templates/extras/objectchange_list.html | 4 +-- netbox/templates/extras/report.html | 4 +-- netbox/templates/inc/image_attachments.html | 2 +- netbox/templates/inc/search_panel.html | 2 +- netbox/templates/ipam/aggregate.html | 4 +-- netbox/templates/ipam/aggregate_list.html | 4 +-- netbox/templates/ipam/inc/service.html | 2 +- netbox/templates/ipam/ipaddress.html | 6 ++-- netbox/templates/ipam/ipaddress_list.html | 4 +-- netbox/templates/ipam/prefix.html | 4 +-- netbox/templates/ipam/prefix_list.html | 4 +-- netbox/templates/ipam/rir_list.html | 4 +-- netbox/templates/ipam/role_list.html | 2 +- netbox/templates/ipam/service.html | 2 +- netbox/templates/ipam/service_list.html | 4 +-- netbox/templates/ipam/vlan.html | 6 ++-- netbox/templates/ipam/vlan_list.html | 4 +-- netbox/templates/ipam/vlangroup_list.html | 4 +-- netbox/templates/ipam/vlangroup_vlans.html | 2 +- netbox/templates/ipam/vrf.html | 4 +-- netbox/templates/ipam/vrf_list.html | 4 +-- .../secrets/inc/private_key_modal.html | 2 +- netbox/templates/secrets/inc/secret_tr.html | 2 +- netbox/templates/secrets/secret.html | 6 ++-- netbox/templates/secrets/secret_list.html | 4 +-- netbox/templates/secrets/secretrole_list.html | 2 +- netbox/templates/tenancy/tenant.html | 4 +-- netbox/templates/tenancy/tenant_list.html | 4 +-- .../templates/tenancy/tenantgroup_list.html | 2 +- netbox/templates/users/api_tokens.html | 2 +- netbox/templates/users/userkey.html | 4 +-- netbox/templates/utilities/obj_table.html | 4 +-- netbox/templates/virtualization/cluster.html | 6 ++-- .../virtualization/cluster_add_devices.html | 2 +- .../virtualization/cluster_list.html | 4 +-- .../virtualization/clustergroup_list.html | 2 +- .../virtualization/clustertype_list.html | 2 +- .../virtualization/virtualmachine.html | 8 ++--- .../virtualization/virtualmachine_list.html | 4 +-- netbox/tenancy/tables.py | 2 +- netbox/virtualization/tables.py | 4 +-- 91 files changed, 198 insertions(+), 181 deletions(-) diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py index c6a215db8..1cddeffb2 100644 --- a/netbox/circuits/tables.py +++ b/netbox/circuits/tables.py @@ -59,7 +59,7 @@ class CircuitTypeTable(BaseTable): name = tables.LinkColumn() circuit_count = tables.Column(verbose_name='Circuits') actions = tables.TemplateColumn( - template_code=CIRCUITTYPE_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='' + template_code=CIRCUITTYPE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) class Meta(BaseTable.Meta): diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py index 5649c10ef..436b9053d 100644 --- a/netbox/dcim/tables.py +++ b/netbox/dcim/tables.py @@ -196,7 +196,7 @@ class RegionTable(BaseTable): slug = tables.Column(verbose_name='Slug') actions = tables.TemplateColumn( template_code=REGION_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -239,7 +239,7 @@ class RackGroupTable(BaseTable): slug = tables.Column() actions = tables.TemplateColumn( template_code=RACKGROUP_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -258,7 +258,7 @@ class RackRoleTable(BaseTable): rack_count = tables.Column(verbose_name='Racks') color = tables.TemplateColumn(COLOR_LABEL, verbose_name='Color') slug = tables.Column(verbose_name='Slug') - actions = tables.TemplateColumn(template_code=RACKROLE_ACTIONS, attrs={'td': {'class': 'text-right'}}, + actions = tables.TemplateColumn(template_code=RACKROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): @@ -309,7 +309,7 @@ class RackReservationTable(BaseTable): rack = tables.LinkColumn('dcim:rack', args=[Accessor('rack.pk')]) unit_list = tables.Column(orderable=False, verbose_name='Units') actions = tables.TemplateColumn( - template_code=RACKRESERVATION_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='' + template_code=RACKRESERVATION_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) class Meta(BaseTable.Meta): @@ -327,7 +327,7 @@ class ManufacturerTable(BaseTable): devicetype_count = tables.Column(verbose_name='Device Types') platform_count = tables.Column(verbose_name='Platforms') slug = tables.Column(verbose_name='Slug') - actions = tables.TemplateColumn(template_code=MANUFACTURER_ACTIONS, attrs={'td': {'class': 'text-right'}}, + actions = tables.TemplateColumn(template_code=MANUFACTURER_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): @@ -463,7 +463,7 @@ class DeviceRoleTable(BaseTable): slug = tables.Column(verbose_name='Slug') actions = tables.TemplateColumn( template_code=DEVICEROLE_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -492,7 +492,7 @@ class PlatformTable(BaseTable): ) actions = tables.TemplateColumn( template_code=PLATFORM_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) @@ -779,7 +779,7 @@ class VirtualChassisTable(BaseTable): member_count = tables.Column(verbose_name='Members') actions = tables.TemplateColumn( template_code=VIRTUALCHASSIS_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) diff --git a/netbox/extras/tables.py b/netbox/extras/tables.py index 5fab8910f..f6933bf48 100644 --- a/netbox/extras/tables.py +++ b/netbox/extras/tables.py @@ -68,7 +68,7 @@ class TagTable(BaseTable): ) actions = tables.TemplateColumn( template_code=TAG_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py index 026cbc980..3d46452b2 100644 --- a/netbox/ipam/tables.py +++ b/netbox/ipam/tables.py @@ -203,7 +203,7 @@ class RIRTable(BaseTable): name = tables.LinkColumn(verbose_name='Name') is_private = BooleanColumn(verbose_name='Private') aggregate_count = tables.Column(verbose_name='Aggregates') - actions = tables.TemplateColumn(template_code=RIR_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='') + actions = tables.TemplateColumn(template_code=RIR_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): model = RIR @@ -288,7 +288,7 @@ class RoleTable(BaseTable): orderable=False, verbose_name='VLANs' ) - actions = tables.TemplateColumn(template_code=ROLE_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='') + actions = tables.TemplateColumn(template_code=ROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): model = Role @@ -392,7 +392,7 @@ class VLANGroupTable(BaseTable): site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')], verbose_name='Site') vlan_count = tables.Column(verbose_name='VLANs') slug = tables.Column(verbose_name='Slug') - actions = tables.TemplateColumn(template_code=VLANGROUP_ACTIONS, attrs={'td': {'class': 'text-right'}}, + actions = tables.TemplateColumn(template_code=VLANGROUP_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='') class Meta(BaseTable.Meta): @@ -437,7 +437,7 @@ class VLANMemberTable(BaseTable): ) actions = tables.TemplateColumn( template_code=VLAN_MEMBER_ACTIONS, - attrs={'td': {'class': 'text-right'}}, + attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index ad618b5d1..0b18251fd 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -49,6 +49,23 @@ footer p { } } +.noprint { + +} + +@media print { + body { + padding-top: 0px; + } + .noprint { + display: none !important; + } + + a[href]:after { + content: none !important; + } +} + /* Collapse the nav menu on displays less than 960px wide */ @media (max-width: 959px) { .navbar-header { diff --git a/netbox/secrets/tables.py b/netbox/secrets/tables.py index 39d260a6d..a547ef4f8 100644 --- a/netbox/secrets/tables.py +++ b/netbox/secrets/tables.py @@ -23,7 +23,7 @@ class SecretRoleTable(BaseTable): secret_count = tables.Column(verbose_name='Secrets') slug = tables.Column(verbose_name='Slug') actions = tables.TemplateColumn( - template_code=SECRETROLE_ACTIONS, attrs={'td': {'class': 'text-right'}}, verbose_name='' + template_code=SECRETROLE_ACTIONS, attrs={'td': {'class': 'text-right noprint'}}, verbose_name='' ) class Meta(BaseTable.Meta): diff --git a/netbox/templates/_base.html b/netbox/templates/_base.html index 9101e08f7..02b6bb32c 100644 --- a/netbox/templates/_base.html +++ b/netbox/templates/_base.html @@ -54,7 +54,7 @@

{% now 'Y-m-d H:i:s T' %}

-
+

Docs · API · diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index edbab3ed4..890b2a880 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -4,7 +4,7 @@ {% block title %}{{ circuit }}{% endblock %} {% block header %} -

+
  1. Circuits
    2. @@ -25,7 +25,7 @@
-
+
{% if perms.circuits.change_circuit %} diff --git a/netbox/templates/circuits/circuit_list.html b/netbox/templates/circuits/circuit_list.html index 81e09c32b..d686bdf7a 100644 --- a/netbox/templates/circuits/circuit_list.html +++ b/netbox/templates/circuits/circuit_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
+
{% if perms.circuits.add_circuit %} {% add_button 'circuits:circuit_add' %} {% import_button 'circuits:circuit_import' %} @@ -14,7 +14,7 @@
{% include 'utilities/obj_table.html' with bulk_edit_url='circuits:circuit_bulk_edit' bulk_delete_url='circuits:circuit_bulk_delete' %}
-
+
{% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
diff --git a/netbox/templates/circuits/circuittype_list.html b/netbox/templates/circuits/circuittype_list.html index 2b9469042..654d4ab09 100644 --- a/netbox/templates/circuits/circuittype_list.html +++ b/netbox/templates/circuits/circuittype_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
+
{% if perms.circuits.add_circuittype %} {% add_button 'circuits:circuittype_add' %} {% import_button 'circuits:circuittype_import' %} diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index a31f093c9..3dd5d973f 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -5,7 +5,7 @@ {% block title %}{{ provider }}{% endblock %} {% block header %} -
+
  1. Providers
    2. @@ -25,7 +25,7 @@
-
+
{% if show_graphs %} @@ -521,7 +521,7 @@ {% endfor %} -
+
{% if interfaces and perms.dcim.change_interface %} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index 0dfdd8260..6fe79810f 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -2,7 +2,7 @@ {% load helpers %} {% block header %} -
+
  1. Aggregates
    2. @@ -23,7 +23,7 @@
-
+
{% if perms.ipam.change_aggregate %} diff --git a/netbox/templates/ipam/aggregate_list.html b/netbox/templates/ipam/aggregate_list.html index 33db74e5c..aad747b2d 100644 --- a/netbox/templates/ipam/aggregate_list.html +++ b/netbox/templates/ipam/aggregate_list.html @@ -3,7 +3,7 @@ {% load humanize %} {% block content %} -
+
{% if perms.ipam.add_aggregate %} {% add_button 'ipam:aggregate_add' %} {% import_button 'ipam:aggregate_import' %} @@ -15,7 +15,7 @@
{% include 'utilities/obj_table.html' with bulk_edit_url='ipam:aggregate_bulk_edit' bulk_delete_url='ipam:aggregate_bulk_delete' %}
-
+
{% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
diff --git a/netbox/templates/ipam/inc/service.html b/netbox/templates/ipam/inc/service.html index c2999be68..6a3a23bde 100644 --- a/netbox/templates/ipam/inc/service.html +++ b/netbox/templates/ipam/inc/service.html @@ -13,7 +13,7 @@ {% endfor %} {{ service.description }} - + diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index b23809e3a..c13653e3c 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -2,7 +2,7 @@ {% load helpers %} {% block header %} -
+
  1. IP Addresses
    2. @@ -25,7 +25,7 @@
-
+
{% if perms.ipam.change_ipaddress %} @@ -150,7 +150,7 @@ {% if duplicate_ips_table.rows %} {% include 'panel_table.html' with table=duplicate_ips_table heading='Duplicate IP Addresses' panel_class='danger' %} {% endif %} - {% include 'panel_table.html' with table=related_ips_table heading='Related IP Addresses' panel_class='default' %} + {% include 'panel_table.html' with table=related_ips_table heading='Related IP Addresses' panel_class='default noprint' %}
{% endblock %} diff --git a/netbox/templates/ipam/ipaddress_list.html b/netbox/templates/ipam/ipaddress_list.html index 418b807bd..12f227301 100644 --- a/netbox/templates/ipam/ipaddress_list.html +++ b/netbox/templates/ipam/ipaddress_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
+
{% if perms.ipam.add_ipaddress %} {% add_button 'ipam:ipaddress_add' %} {% import_button 'ipam:ipaddress_import' %} @@ -14,7 +14,7 @@
{% include 'utilities/obj_table.html' with bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
-
+
{% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 0e3aff6b0..281515278 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -2,7 +2,7 @@ {% load helpers %} {% block header %} -
+
  1. Prefixes
    2. @@ -25,7 +25,7 @@
-
+
{% if perms.ipam.add_prefix and active_tab == 'prefixes' and first_available_prefix %} Add Child Prefix diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html index 3ce9d4a9c..b80af8e1d 100644 --- a/netbox/templates/ipam/prefix_list.html +++ b/netbox/templates/ipam/prefix_list.html @@ -3,7 +3,7 @@ {% load helpers %} {% block content %} -
+
Collapse Expand @@ -19,7 +19,7 @@
{% include 'utilities/obj_table.html' with bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
-
+
{% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
diff --git a/netbox/templates/ipam/rir_list.html b/netbox/templates/ipam/rir_list.html index 67356b3cb..846eb3cb2 100644 --- a/netbox/templates/ipam/rir_list.html +++ b/netbox/templates/ipam/rir_list.html @@ -3,7 +3,7 @@ {% load humanize %} {% block content %} -
+
{% if request.GET.family == '6' %} @@ -29,7 +29,7 @@
Note: Numbers shown indicate /64 prefixes.
{% endif %}
-
+
{% include 'inc/search_panel.html' %}
diff --git a/netbox/templates/ipam/role_list.html b/netbox/templates/ipam/role_list.html index cd6fcd7aa..958fa8e06 100644 --- a/netbox/templates/ipam/role_list.html +++ b/netbox/templates/ipam/role_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
+
{% if perms.ipam.add_role %} {% add_button 'ipam:role_add' %} {% import_button 'ipam:role_import' %} diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html index 17b1d971e..4d309da0c 100644 --- a/netbox/templates/ipam/service.html +++ b/netbox/templates/ipam/service.html @@ -2,7 +2,7 @@ {% load helpers %} {% block content %} -
+
  1. Services
    2. diff --git a/netbox/templates/ipam/service_list.html b/netbox/templates/ipam/service_list.html index d2e67a000..a39bec22e 100644 --- a/netbox/templates/ipam/service_list.html +++ b/netbox/templates/ipam/service_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
    +
    {% export_button content_type %}

    {% block title %}Services{% endblock %}

    @@ -10,7 +10,7 @@
    {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:service_bulk_edit' bulk_delete_url='ipam:service_bulk_delete' %}
    -
    +
    {% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
    diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 96e3a5e10..7798bf9e0 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -2,7 +2,7 @@ {% load helpers %} {% block header %} -
    +
    1. VLANs
      2. @@ -28,7 +28,7 @@
    -
    +
    {% if perms.ipam.change_vlan %} @@ -143,7 +143,7 @@
    {% include 'responsive_table.html' with table=prefix_table %} {% if perms.ipam.add_prefix %} -
    +
    Add a prefix diff --git a/netbox/templates/ipam/vlan_list.html b/netbox/templates/ipam/vlan_list.html index d734db8d2..b4d313a8c 100644 --- a/netbox/templates/ipam/vlan_list.html +++ b/netbox/templates/ipam/vlan_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
    +
    {% if perms.ipam.add_vlan %} {% add_button 'ipam:vlan_add' %} {% import_button 'ipam:vlan_import' %} @@ -14,7 +14,7 @@
    {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vlan_bulk_edit' bulk_delete_url='ipam:vlan_bulk_delete' %}
    -
    +
    {% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
    diff --git a/netbox/templates/ipam/vlangroup_list.html b/netbox/templates/ipam/vlangroup_list.html index 9333f95c7..16ddd9669 100644 --- a/netbox/templates/ipam/vlangroup_list.html +++ b/netbox/templates/ipam/vlangroup_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
    +
    {% if perms.ipam.add_vlangroup %} {% add_button 'ipam:vlangroup_add' %} {% import_button 'ipam:vlangroup_import' %} @@ -14,7 +14,7 @@
    {% include 'utilities/obj_table.html' with bulk_delete_url='ipam:vlangroup_bulk_delete' %}
    -
    +
    {% include 'inc/search_panel.html' %}
    diff --git a/netbox/templates/ipam/vlangroup_vlans.html b/netbox/templates/ipam/vlangroup_vlans.html index 49532fb95..34810b1d2 100644 --- a/netbox/templates/ipam/vlangroup_vlans.html +++ b/netbox/templates/ipam/vlangroup_vlans.html @@ -3,7 +3,7 @@ {% block title %}{{ vlan_group }} - VLANs{% endblock %} {% block content %} -
    +
    1. VLAN Groups
      2. diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index 0ed534aa3..fb81d7ee1 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -2,7 +2,7 @@ {% load helpers %} {% block header %} -
      +
      1. VRFs
        2. @@ -22,7 +22,7 @@
      -
      +
      {% if perms.ipam.change_vrf %} diff --git a/netbox/templates/ipam/vrf_list.html b/netbox/templates/ipam/vrf_list.html index 670f0ee5d..566e2f3e6 100644 --- a/netbox/templates/ipam/vrf_list.html +++ b/netbox/templates/ipam/vrf_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
      +
      {% if perms.ipam.add_vrf %} {% add_button 'ipam:vrf_add' %} {% import_button 'ipam:vrf_import' %} @@ -14,7 +14,7 @@
      {% include 'utilities/obj_table.html' with bulk_edit_url='ipam:vrf_bulk_edit' bulk_delete_url='ipam:vrf_bulk_delete' %}
      -
      +
      {% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
      diff --git a/netbox/templates/secrets/inc/private_key_modal.html b/netbox/templates/secrets/inc/private_key_modal.html index 77a214153..f165df400 100644 --- a/netbox/templates/secrets/inc/private_key_modal.html +++ b/netbox/templates/secrets/inc/private_key_modal.html @@ -16,7 +16,7 @@
      -
      +
      diff --git a/netbox/templates/secrets/inc/secret_tr.html b/netbox/templates/secrets/inc/secret_tr.html index c8ee10a4e..3c60928ae 100644 --- a/netbox/templates/secrets/inc/secret_tr.html +++ b/netbox/templates/secrets/inc/secret_tr.html @@ -3,7 +3,7 @@ {{ secret.role }} {{ secret.name }} ******** - + {% if secret|decryptable_by:request.user %} diff --git a/netbox/templates/secrets/secret_list.html b/netbox/templates/secrets/secret_list.html index a41c0b4ee..b6d792765 100644 --- a/netbox/templates/secrets/secret_list.html +++ b/netbox/templates/secrets/secret_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
      +
      {% if perms.secrets.add_secret %} {% import_button 'secrets:secret_import' %} {% endif %} @@ -13,7 +13,7 @@
      {% include 'utilities/obj_table.html' with bulk_edit_url='secrets:secret_bulk_edit' bulk_delete_url='secrets:secret_bulk_delete' %}
      -
      +
      {% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
      diff --git a/netbox/templates/secrets/secretrole_list.html b/netbox/templates/secrets/secretrole_list.html index e968630f6..0e4caadae 100644 --- a/netbox/templates/secrets/secretrole_list.html +++ b/netbox/templates/secrets/secretrole_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
      +
      {% if perms.secrets.add_secretrole %} {% add_button 'secrets:secretrole_add' %} {% import_button 'secrets:secretrole_import' %} diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index 91d3ce986..2cb925303 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -2,7 +2,7 @@ {% load helpers %} {% block header %} -
      +
      1. Tenants
        2. @@ -25,7 +25,7 @@
      -
      +
      {% if perms.tenancy.change_tenant %} diff --git a/netbox/templates/tenancy/tenant_list.html b/netbox/templates/tenancy/tenant_list.html index 176231507..91463c52c 100644 --- a/netbox/templates/tenancy/tenant_list.html +++ b/netbox/templates/tenancy/tenant_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
      +
      {% if perms.tenancy.add_tenant %} {% add_button 'tenancy:tenant_add' %} {% import_button 'tenancy:tenant_import' %} @@ -14,7 +14,7 @@
      {% include 'utilities/obj_table.html' with bulk_edit_url='tenancy:tenant_bulk_edit' bulk_delete_url='tenancy:tenant_bulk_delete' %}
      -
      +
      {% include 'inc/search_panel.html' %} {% include 'inc/tags_panel.html' %}
      diff --git a/netbox/templates/tenancy/tenantgroup_list.html b/netbox/templates/tenancy/tenantgroup_list.html index a62594994..af0dc1aad 100644 --- a/netbox/templates/tenancy/tenantgroup_list.html +++ b/netbox/templates/tenancy/tenantgroup_list.html @@ -2,7 +2,7 @@ {% load buttons %} {% block content %} -
      +
      {% if perms.tenancy.add_tenantgroup %} {% add_button 'tenancy:tenantgroup_add' %} {% import_button 'tenancy:tenantgroup_import' %} diff --git a/netbox/templates/users/api_tokens.html b/netbox/templates/users/api_tokens.html index b152497f5..c6a219381 100644 --- a/netbox/templates/users/api_tokens.html +++ b/netbox/templates/users/api_tokens.html @@ -9,7 +9,7 @@ {% for token in tokens %}
      -
      +
      {% if perms.users.change_token %} Edit {% endif %} diff --git a/netbox/templates/users/userkey.html b/netbox/templates/users/userkey.html index a2425f224..e98ec4030 100644 --- a/netbox/templates/users/userkey.html +++ b/netbox/templates/users/userkey.html @@ -4,7 +4,7 @@ {% block usercontent %} {% if userkey %} -
      +
      Edit user key @@ -28,7 +28,7 @@ 
      {{ userkey.public_key }}
      {% if userkey.session_key %} -
      +
      Delete session key diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html index 8c5e3b8be..1307ccb69 100644 --- a/netbox/templates/utilities/obj_table.html +++ b/netbox/templates/utilities/obj_table.html @@ -4,7 +4,7 @@ {% csrf_token %} {% if table.paginator.num_pages > 1 %} -