From 4f36885c5ec97ae2550598d27607d3acaa2f1a5b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 09:13:34 -0400 Subject: [PATCH 01/12] Fixes #7096: Home links should honor BASE_PATH configuration --- docs/release-notes/version-3.0.md | 3 ++- netbox/templates/base/sidenav.html | 4 ++-- netbox/templates/media_failure.html | 2 +- netbox/templates/rest_framework/api.html | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index fd7603c0e..e33ef2663 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -1,11 +1,12 @@ # NetBox v3.0 -## v2.11.12 (2021-08-23) +## v3.0.1 (FUTURE) ### Bug Fixes * [#7070](https://github.com/netbox-community/netbox/issues/7070) - Fix exception when filtering by prefix max length in UI * [#7071](https://github.com/netbox-community/netbox/issues/7071) - Fix exception when removing a primary IP from a device/VM +* [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration --- diff --git a/netbox/templates/base/sidenav.html b/netbox/templates/base/sidenav.html index 8941171e5..5790e8c44 100644 --- a/netbox/templates/base/sidenav.html +++ b/netbox/templates/base/sidenav.html @@ -7,12 +7,12 @@ {# Brand #} {# Full Logo #} - + NetBox Logo {# Icon Logo #} - + NetBox Logo diff --git a/netbox/templates/media_failure.html b/netbox/templates/media_failure.html index 10b01291d..e3b7ef309 100644 --- a/netbox/templates/media_failure.html +++ b/netbox/templates/media_failure.html @@ -42,7 +42,7 @@ The file {{ filename }} exists in the static root directory and is readable by the HTTP process. -

Click here to attempt loading NetBox again.

+

Click here to attempt loading NetBox again.

diff --git a/netbox/templates/rest_framework/api.html b/netbox/templates/rest_framework/api.html index 36bf7a554..7ece5905c 100644 --- a/netbox/templates/rest_framework/api.html +++ b/netbox/templates/rest_framework/api.html @@ -9,5 +9,5 @@ {% block title %}{% if name %}{{ name }} | {% endif %}NetBox REST API{% endblock %} {% block branding %} - NetBox + NetBox {% endblock branding %} From 30909813357e5714d9f43c756d6ab3ce9ab11217 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 09:39:49 -0400 Subject: [PATCH 02/12] Fixes #7084: Fix KeyError exception when editing access VLAN on an interface --- docs/release-notes/version-3.0.md | 1 + netbox/dcim/forms.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index e33ef2663..c31de7e63 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -6,6 +6,7 @@ * [#7070](https://github.com/netbox-community/netbox/issues/7070) - Fix exception when filtering by prefix max length in UI * [#7071](https://github.com/netbox-community/netbox/issues/7071) - Fix exception when removing a primary IP from a device/VM +* [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration --- diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index b69944cf6..96a58a0c3 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -129,7 +129,7 @@ class InterfaceCommonForm(forms.Form): super().clean() parent_field = 'device' if 'device' in self.cleaned_data else 'virtual_machine' - tagged_vlans = self.cleaned_data['tagged_vlans'] + tagged_vlans = self.cleaned_data.get('tagged_vlans') # Untagged interfaces cannot be assigned tagged VLANs if self.cleaned_data['mode'] == InterfaceModeChoices.MODE_ACCESS and tagged_vlans: @@ -142,7 +142,7 @@ class InterfaceCommonForm(forms.Form): self.cleaned_data['tagged_vlans'] = [] # Validate tagged VLANs; must be a global VLAN or in the same site - elif self.cleaned_data['mode'] == InterfaceModeChoices.MODE_TAGGED: + elif self.cleaned_data['mode'] == InterfaceModeChoices.MODE_TAGGED and tagged_vlans: valid_sites = [None, self.cleaned_data[parent_field].site] invalid_vlans = [str(v) for v in tagged_vlans if v.site not in valid_sites] From 65c93396877dad85e2864f3b5834f2af04ca959d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 09:41:54 -0400 Subject: [PATCH 03/12] Fixes #7083: Correct labeling for VM memory attribute --- docs/release-notes/version-3.0.md | 1 + netbox/templates/virtualization/virtualmachine.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index c31de7e63..160f8b892 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -6,6 +6,7 @@ * [#7070](https://github.com/netbox-community/netbox/issues/7070) - Fix exception when filtering by prefix max length in UI * [#7071](https://github.com/netbox-community/netbox/issues/7071) - Fix exception when removing a primary IP from a device/VM +* [#7083](https://github.com/netbox-community/netbox/issues/7083) - Correct labeling for VM memory attribute * [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 6ea4e8d7c..249ef91e4 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -131,7 +131,7 @@ Memory {% if object.memory %} - {{ object.memory|humanize_megabytes }} MB + {{ object.memory|humanize_megabytes }} {% else %} — {% endif %} From 8036d1e5a51dca180b85f576e6a4f4bcaa3563de Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 09:50:24 -0400 Subject: [PATCH 04/12] Fixes #7078: Restore styling on server error page --- netbox/templates/500.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/templates/500.html b/netbox/templates/500.html index 427345e56..e0207f74d 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -4,7 +4,7 @@ Server Error - + @@ -12,7 +12,7 @@
-
+
Server Error
From 7db2b9d0916496ae65524fe21048a070a6b601f0 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 11:15:41 -0400 Subject: [PATCH 05/12] Fixes #7072: Fix table configuration under prefix child object views --- docs/release-notes/version-3.0.md | 1 + netbox/ipam/views.py | 9 ++++----- netbox/netbox/views/generic.py | 1 - netbox/templates/ipam/prefix/ip_addresses.html | 8 ++++++++ netbox/templates/ipam/prefix/ip_ranges.html | 9 ++++++++- netbox/templates/ipam/prefix/prefixes.html | 16 +++++++--------- .../templatetags/table_config_form.html | 10 +++++----- netbox/utilities/templatetags/helpers.py | 2 +- 8 files changed, 34 insertions(+), 22 deletions(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 160f8b892..e88d1fc6f 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -6,6 +6,7 @@ * [#7070](https://github.com/netbox-community/netbox/issues/7070) - Fix exception when filtering by prefix max length in UI * [#7071](https://github.com/netbox-community/netbox/issues/7071) - Fix exception when removing a primary IP from a device/VM +* [#7072](https://github.com/netbox-community/netbox/issues/7072) - Fix table configuration under prefix child object views * [#7083](https://github.com/netbox-community/netbox/issues/7083) - Correct labeling for VM memory attribute * [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index eed03885e..5151fdd20 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -404,12 +404,11 @@ class PrefixPrefixesView(generic.ObjectView): bulk_querystring = 'vrf_id={}&within={}'.format(instance.vrf.pk if instance.vrf else '0', instance.prefix) return { - 'first_available_prefix': instance.get_first_available_prefix(), 'table': table, 'bulk_querystring': bulk_querystring, 'active_tab': 'prefixes', + 'first_available_prefix': instance.get_first_available_prefix(), 'show_available': request.GET.get('show_available', 'true') == 'true', - 'table_config_form': TableConfigForm(table=table), } @@ -421,7 +420,7 @@ class PrefixIPRangesView(generic.ObjectView): # Find all IPRanges belonging to this Prefix ip_ranges = instance.get_child_ranges().restrict(request.user, 'view').prefetch_related('vrf') - table = tables.IPRangeTable(ip_ranges) + table = tables.IPRangeTable(ip_ranges, user=request.user) if request.user.has_perm('ipam.change_iprange') or request.user.has_perm('ipam.delete_iprange'): table.columns.show('pk') paginate_table(table, request) @@ -449,7 +448,7 @@ class PrefixIPAddressesView(generic.ObjectView): if request.GET.get('show_available', 'true') == 'true': ipaddresses = add_available_ipaddresses(instance.prefix, ipaddresses, instance.is_pool) - table = tables.IPAddressTable(ipaddresses) + table = tables.IPAddressTable(ipaddresses, user=request.user) if request.user.has_perm('ipam.change_ipaddress') or request.user.has_perm('ipam.delete_ipaddress'): table.columns.show('pk') paginate_table(table, request) @@ -457,10 +456,10 @@ class PrefixIPAddressesView(generic.ObjectView): bulk_querystring = 'vrf_id={}&parent={}'.format(instance.vrf.pk if instance.vrf else '0', instance.prefix) return { - 'first_available_ip': instance.get_first_available_ip(), 'table': table, 'bulk_querystring': bulk_querystring, 'active_tab': 'ip-addresses', + 'first_available_ip': instance.get_first_available_ip(), 'show_available': request.GET.get('show_available', 'true') == 'true', } diff --git a/netbox/netbox/views/generic.py b/netbox/netbox/views/generic.py index b00999b15..aafb2f3d8 100644 --- a/netbox/netbox/views/generic.py +++ b/netbox/netbox/views/generic.py @@ -181,7 +181,6 @@ class ObjectListView(ObjectPermissionRequiredMixin, View): 'table': table, 'permissions': permissions, 'action_buttons': self.action_buttons, - 'table_config_form': TableConfigForm(table=table), 'filter_form': self.filterset_form(request.GET, label_suffix='') if self.filterset_form else None, } context.update(self.extra_context()) diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html index e8c9704bb..0b1fe83b4 100644 --- a/netbox/templates/ipam/prefix/ip_addresses.html +++ b/netbox/templates/ipam/prefix/ip_addresses.html @@ -1,4 +1,6 @@ {% extends 'ipam/prefix/base.html' %} +{% load helpers %} +{% load static %} {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %} @@ -11,7 +13,13 @@ {% block content %}
+ {% include 'inc/table_controls.html' with table_modal="IPAddressTable_config" %} {% include 'utilities/obj_table.html' with heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
+ {% table_config_form table table_name="IPAddressTable" %} +{% endblock %} + +{% block javascript %} + {% endblock %} diff --git a/netbox/templates/ipam/prefix/ip_ranges.html b/netbox/templates/ipam/prefix/ip_ranges.html index 334cc90b0..18b53d945 100644 --- a/netbox/templates/ipam/prefix/ip_ranges.html +++ b/netbox/templates/ipam/prefix/ip_ranges.html @@ -1,10 +1,17 @@ {% extends 'ipam/prefix/base.html' %} - +{% load helpers %} +{% load static %} {% block content %}
+ {% include 'inc/table_controls.html' with table_modal="IPRangeTable_config" %} {% include 'utilities/obj_table.html' with heading='Child IP Ranges' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %}
+ {% table_config_form table table_name="IPRangeTable" %} +{% endblock %} + +{% block javascript %} + {% endblock %} diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html index 998b7b70b..6dcbed77d 100644 --- a/netbox/templates/ipam/prefix/prefixes.html +++ b/netbox/templates/ipam/prefix/prefixes.html @@ -2,20 +2,17 @@ {% load helpers %} {% load static %} -{% block buttons %} +{% block extra_controls %} {% include 'ipam/inc/toggle_available.html' %} - {% if request.user.is_authenticated and table_config_form %} - - {% endif %} {% if perms.ipam.add_prefix and active_tab == 'prefixes' and first_available_prefix %} - + Add Child Prefix {% endif %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %} - + - Add an IP Address + Add Child IP Address {% endif %} {{ block.super }} @@ -24,12 +21,13 @@ {% block content %}
+ {% include 'inc/table_controls.html' with table_modal="PrefixDetailTable_config" %} {% include 'utilities/obj_table.html' with heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %}
- {% table_config_form prefix_table table_name="PrefixDetailTable" %} + {% table_config_form table table_name="PrefixDetailTable" %} {% endblock %} {% block javascript %} - + {% endblock %} diff --git a/netbox/templates/utilities/templatetags/table_config_form.html b/netbox/templates/utilities/templatetags/table_config_form.html index 3c44642d4..5e17497e9 100644 --- a/netbox/templates/utilities/templatetags/table_config_form.html +++ b/netbox/templates/utilities/templatetags/table_config_form.html @@ -7,11 +7,11 @@
Table Configuration
-
+
- {{ table_config_form.available_columns.label }} - {{ table_config_form.available_columns }} + {{ form.available_columns.label }} + {{ form.available_columns }}
@@ -24,8 +24,8 @@
- {{ table_config_form.columns.label }} - {{ table_config_form.columns }} + {{ form.columns.label }} + {{ form.columns }} Move Up diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 48b5ab13f..dbaaebeb2 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -401,7 +401,7 @@ def badge(value, bg_class='secondary', show_empty=False): def table_config_form(table, table_name=None): return { 'table_name': table_name or table.__class__.__name__, - 'table_config_form': TableConfigForm(table=table), + 'form': TableConfigForm(table=table), } From 415313ac2f9ffa76747ec905e467c1e1118205b9 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 11:43:44 -0400 Subject: [PATCH 06/12] Fixes #7082: Avoid exception when referencing invalid content type in table --- docs/release-notes/version-3.0.md | 1 + netbox/utilities/tables.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index e88d1fc6f..9c248f449 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -7,6 +7,7 @@ * [#7070](https://github.com/netbox-community/netbox/issues/7070) - Fix exception when filtering by prefix max length in UI * [#7071](https://github.com/netbox-community/netbox/issues/7071) - Fix exception when removing a primary IP from a device/VM * [#7072](https://github.com/netbox-community/netbox/issues/7072) - Fix table configuration under prefix child object views +* [#7082](https://github.com/netbox-community/netbox/issues/7082) - Avoid exception when referencing invalid content type in table * [#7083](https://github.com/netbox-community/netbox/issues/7083) - Correct labeling for VM memory attribute * [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index 26a16c171..ed1dcf5ce 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -237,9 +237,13 @@ class ContentTypeColumn(tables.Column): Display a ContentType instance. """ def render(self, value): + if value is None: + return None return content_type_name(value) def value(self, value): + if value is None: + return None return f"{value.app_label}.{value.model}" From 7b7b01a26bc5d4a2c6578f01ca1b6b1e17d8683e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 11:44:51 -0400 Subject: [PATCH 07/12] Changelog for #7075 --- docs/release-notes/version-3.0.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 9c248f449..4de00d9ab 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -7,6 +7,7 @@ * [#7070](https://github.com/netbox-community/netbox/issues/7070) - Fix exception when filtering by prefix max length in UI * [#7071](https://github.com/netbox-community/netbox/issues/7071) - Fix exception when removing a primary IP from a device/VM * [#7072](https://github.com/netbox-community/netbox/issues/7072) - Fix table configuration under prefix child object views +* [#7075](https://github.com/netbox-community/netbox/issues/7075) - Fix UI bug when a custom field has a space in the name * [#7082](https://github.com/netbox-community/netbox/issues/7082) - Avoid exception when referencing invalid content type in table * [#7083](https://github.com/netbox-community/netbox/issues/7083) - Correct labeling for VM memory attribute * [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface From 86da6c6c14181238140da3e8d8cdef1db8a6a3a9 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Tue, 31 Aug 2021 11:31:40 -0500 Subject: [PATCH 08/12] Fixes #7089 - Adds Q filter to ContentTypeFilterSet --- docs/release-notes/version-3.0.md | 1 + netbox/extras/filtersets.py | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 4de00d9ab..eb0cb948f 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -11,6 +11,7 @@ * [#7082](https://github.com/netbox-community/netbox/issues/7082) - Avoid exception when referencing invalid content type in table * [#7083](https://github.com/netbox-community/netbox/issues/7083) - Correct labeling for VM memory attribute * [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface +* [#7089](https://github.com/netbox-community/netbox/issues/7089) - Fix ContentTypeFilterSet not filtering on q filter * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration --- diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index 2a6ae088c..b827e5289 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -367,6 +367,18 @@ class JobResultFilterSet(BaseFilterSet): # class ContentTypeFilterSet(django_filters.FilterSet): + q = django_filters.CharFilter( + method='search', + label='Search', + ) + + def search(self, queryset, name, value): + if not value.strip(): + return queryset + return queryset.filter( + Q(app_label__icontains=value) | + Q(model__icontains=value) + ) class Meta: model = ContentType From c4c6fa604296df27703e0666833c524c52dededf Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Tue, 31 Aug 2021 11:41:50 -0500 Subject: [PATCH 09/12] Fix misplacement of method for #7089 --- netbox/extras/filtersets.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/extras/filtersets.py b/netbox/extras/filtersets.py index b827e5289..25fd32f0d 100644 --- a/netbox/extras/filtersets.py +++ b/netbox/extras/filtersets.py @@ -372,6 +372,10 @@ class ContentTypeFilterSet(django_filters.FilterSet): label='Search', ) + class Meta: + model = ContentType + fields = ['id', 'app_label', 'model'] + def search(self, queryset, name, value): if not value.strip(): return queryset @@ -379,7 +383,3 @@ class ContentTypeFilterSet(django_filters.FilterSet): Q(app_label__icontains=value) | Q(model__icontains=value) ) - - class Meta: - model = ContentType - fields = ['id', 'app_label', 'model'] From 1c09ffdd1f6bc6c7dc4daf45ac8a582da5246fed Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 13:52:04 -0400 Subject: [PATCH 10/12] Fixes #7101: Enforce MAX_PAGE_SIZE for table and REST API pagination --- docs/release-notes/version-3.0.md | 1 + netbox/netbox/api/pagination.py | 20 +++++--------------- netbox/netbox/settings.py | 4 ++++ netbox/utilities/paginator.py | 12 ++++++++---- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index eb0cb948f..727d067ac 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -13,6 +13,7 @@ * [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface * [#7089](https://github.com/netbox-community/netbox/issues/7089) - Fix ContentTypeFilterSet not filtering on q filter * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration +* [#7101](https://github.com/netbox-community/netbox/issues/7101) - Enforce `MAX_PAGE_SIZE` for table and REST API pagination --- diff --git a/netbox/netbox/api/pagination.py b/netbox/netbox/api/pagination.py index d489ce951..77af755ce 100644 --- a/netbox/netbox/api/pagination.py +++ b/netbox/netbox/api/pagination.py @@ -34,23 +34,13 @@ class OptionalLimitOffsetPagination(LimitOffsetPagination): return list(queryset[self.offset:]) def get_limit(self, request): + limit = super().get_limit(request) - if self.limit_query_param: - try: - limit = int(request.query_params[self.limit_query_param]) - if limit < 0: - raise ValueError() - # Enforce maximum page size, if defined - if settings.MAX_PAGE_SIZE: - if limit == 0: - return settings.MAX_PAGE_SIZE - else: - return min(limit, settings.MAX_PAGE_SIZE) - return limit - except (KeyError, ValueError): - pass + # Enforce maximum page size + if settings.MAX_PAGE_SIZE: + limit = min(limit, settings.MAX_PAGE_SIZE) - return self.default_limit + return limit def get_next_link(self): diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index b05097f3b..4f0e8956e 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -560,6 +560,10 @@ RQ_QUEUES = { # # Pagination +if MAX_PAGE_SIZE and PAGINATE_COUNT > MAX_PAGE_SIZE: + raise ImproperlyConfigured( + f"PAGINATE_COUNT ({PAGINATE_COUNT}) must be less than or equal to MAX_PAGE_SIZE ({MAX_PAGE_SIZE}), if set." + ) PER_PAGE_DEFAULTS = [ 25, 50, 100, 250, 500, 1000 ] diff --git a/netbox/utilities/paginator.py b/netbox/utilities/paginator.py index 3b9e1cb37..e46af4b3e 100644 --- a/netbox/utilities/paginator.py +++ b/netbox/utilities/paginator.py @@ -49,21 +49,25 @@ class EnhancedPage(Page): def get_paginate_count(request): """ - Determine the length of a page, using the following in order: + Determine the desired length of a page, using the following in order: 1. per_page URL query parameter 2. Saved user preference 3. PAGINATE_COUNT global setting. + + Return the lesser of the calculated value and MAX_PAGE_SIZE. """ if 'per_page' in request.GET: try: per_page = int(request.GET.get('per_page')) if request.user.is_authenticated: request.user.config.set('pagination.per_page', per_page, commit=True) - return per_page + return min(per_page, settings.MAX_PAGE_SIZE) except ValueError: pass if request.user.is_authenticated: - return request.user.config.get('pagination.per_page', settings.PAGINATE_COUNT) - return settings.PAGINATE_COUNT + per_page = request.user.config.get('pagination.per_page', settings.PAGINATE_COUNT) + return min(per_page, settings.MAX_PAGE_SIZE) + + return min(settings.PAGINATE_COUNT, settings.MAX_PAGE_SIZE) From 349733c6dd2f8a351d2a188e7b148bf9c089ca04 Mon Sep 17 00:00:00 2001 From: Brian Candler Date: Tue, 31 Aug 2021 19:51:53 +0100 Subject: [PATCH 11/12] Redirect users on error to the GitHub discussion forum Fixes #7102 --- netbox/templates/500.html | 2 +- netbox/utilities/management/commands/makemigrations.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/templates/500.html b/netbox/templates/500.html index e0207f74d..097699ffc 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -32,7 +32,7 @@ Python version: {{ python_version }} NetBox version: {{ netbox_version }}

- If further assistance is required, please post to the NetBox mailing list. + If further assistance is required, please post to the NetBox discussion forum on GitHub.

Home Page diff --git a/netbox/utilities/management/commands/makemigrations.py b/netbox/utilities/management/commands/makemigrations.py index 8b5cd1bc7..6710a35e2 100644 --- a/netbox/utilities/management/commands/makemigrations.py +++ b/netbox/utilities/management/commands/makemigrations.py @@ -21,8 +21,8 @@ class Command(_Command): raise CommandError( "This command is available for development purposes only. It will\n" "NOT resolve any issues with missing or unapplied migrations. For assistance,\n" - "please post to the NetBox mailing list:\n" - " https://groups.google.com/g/netbox-discuss" + "please post to the NetBox discussion forum on GitHub:\n" + " https://github.com/netbox-community/netbox/discussions" ) super().handle(*args, **kwargs) From a8cdb3895b1100301f64c4146a9e95923823201d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 31 Aug 2021 15:03:39 -0400 Subject: [PATCH 12/12] Fixes #7093: Multi-select custom field filters should employ exact match --- docs/release-notes/version-3.0.md | 1 + netbox/extras/filters.py | 5 ++++- netbox/extras/tests/test_customfields.py | 19 ++++++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index 727d067ac..b4dff6676 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -12,6 +12,7 @@ * [#7083](https://github.com/netbox-community/netbox/issues/7083) - Correct labeling for VM memory attribute * [#7084](https://github.com/netbox-community/netbox/issues/7084) - Fix KeyError exception when editing access VLAN on an interface * [#7089](https://github.com/netbox-community/netbox/issues/7089) - Fix ContentTypeFilterSet not filtering on q filter +* [#7093](https://github.com/netbox-community/netbox/issues/7093) - Multi-select custom field filters should employ exact match * [#7096](https://github.com/netbox-community/netbox/issues/7096) - Home links should honor `BASE_PATH` configuration * [#7101](https://github.com/netbox-community/netbox/issues/7101) - Enforce `MAX_PAGE_SIZE` for table and REST API pagination diff --git a/netbox/extras/filters.py b/netbox/extras/filters.py index aef2046fd..b37aaf40e 100644 --- a/netbox/extras/filters.py +++ b/netbox/extras/filters.py @@ -14,6 +14,7 @@ EXACT_FILTER_TYPES = ( CustomFieldTypeChoices.TYPE_DATE, CustomFieldTypeChoices.TYPE_INTEGER, CustomFieldTypeChoices.TYPE_SELECT, + CustomFieldTypeChoices.TYPE_MULTISELECT, ) @@ -35,7 +36,9 @@ class CustomFieldFilter(django_filters.Filter): self.field_name = f'custom_field_data__{self.field_name}' - if custom_field.type not in EXACT_FILTER_TYPES: + if custom_field.type == CustomFieldTypeChoices.TYPE_MULTISELECT: + self.lookup_expr = 'has_key' + elif custom_field.type not in EXACT_FILTER_TYPES: if custom_field.filter_logic == CustomFieldFilterLogicChoices.FILTER_LOOSE: self.lookup_expr = 'icontains' diff --git a/netbox/extras/tests/test_customfields.py b/netbox/extras/tests/test_customfields.py index b1bf10be6..c2a2da3dc 100644 --- a/netbox/extras/tests/test_customfields.py +++ b/netbox/extras/tests/test_customfields.py @@ -681,7 +681,12 @@ class CustomFieldFilterTest(TestCase): cf.content_types.set([obj_type]) # Selection filtering - cf = CustomField(name='cf8', type=CustomFieldTypeChoices.TYPE_URL, choices=['Foo', 'Bar', 'Baz']) + cf = CustomField(name='cf8', type=CustomFieldTypeChoices.TYPE_SELECT, choices=['Foo', 'Bar', 'Baz']) + cf.save() + cf.content_types.set([obj_type]) + + # Multiselect filtering + cf = CustomField(name='cf9', type=CustomFieldTypeChoices.TYPE_MULTISELECT, choices=['A', 'AA', 'B', 'C']) cf.save() cf.content_types.set([obj_type]) @@ -695,6 +700,7 @@ class CustomFieldFilterTest(TestCase): 'cf6': 'http://foo.example.com/', 'cf7': 'http://foo.example.com/', 'cf8': 'Foo', + 'cf9': ['A', 'B'], }), Site(name='Site 2', slug='site-2', custom_field_data={ 'cf1': 200, @@ -705,9 +711,9 @@ class CustomFieldFilterTest(TestCase): 'cf6': 'http://bar.example.com/', 'cf7': 'http://bar.example.com/', 'cf8': 'Bar', + 'cf9': ['AA', 'B'], }), - Site(name='Site 3', slug='site-3', custom_field_data={ - }), + Site(name='Site 3', slug='site-3'), ]) def test_filter_integer(self): @@ -730,3 +736,10 @@ class CustomFieldFilterTest(TestCase): def test_filter_select(self): self.assertEqual(self.filterset({'cf_cf8': 'Foo'}, self.queryset).qs.count(), 1) + self.assertEqual(self.filterset({'cf_cf8': 'Bar'}, self.queryset).qs.count(), 1) + self.assertEqual(self.filterset({'cf_cf8': 'Baz'}, self.queryset).qs.count(), 0) + + def test_filter_multiselect(self): + self.assertEqual(self.filterset({'cf_cf9': 'A'}, self.queryset).qs.count(), 1) + self.assertEqual(self.filterset({'cf_cf9': 'B'}, self.queryset).qs.count(), 2) + self.assertEqual(self.filterset({'cf_cf9': 'C'}, self.queryset).qs.count(), 0)