From a597ad849e35a5445b34cab3076217076f2f85c9 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 05:02:20 +0000 Subject: [PATCH 01/18] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 106 +++++++++---------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index b8b3cf9a3..7a60e6028 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-12 05:01+0000\n" +"POT-Creation-Date: 2024-06-13 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -325,7 +325,7 @@ msgstr "" #: netbox/circuits/tables/providers.py:33 netbox/dcim/forms/bulk_edit.py:127 #: netbox/dcim/forms/filtersets.py:188 netbox/dcim/forms/model_forms.py:122 #: netbox/dcim/tables/sites.py:94 netbox/ipam/models/asns.py:126 -#: netbox/ipam/tables/asn.py:27 netbox/ipam/views.py:219 +#: netbox/ipam/tables/asn.py:27 netbox/ipam/views.py:210 #: netbox/netbox/navigation/menu.py:159 netbox/netbox/navigation/menu.py:162 #: netbox/templates/circuits/provider.html:23 msgid "ASNs" @@ -895,7 +895,7 @@ msgstr "" #: netbox/dcim/forms/filtersets.py:653 netbox/dcim/forms/filtersets.py:1010 #: netbox/netbox/navigation/menu.py:44 netbox/netbox/navigation/menu.py:46 #: netbox/tenancy/forms/filtersets.py:42 netbox/tenancy/tables/columns.py:70 -#: netbox/tenancy/tables/contacts.py:25 netbox/tenancy/views.py:19 +#: netbox/tenancy/tables/contacts.py:25 netbox/tenancy/views.py:18 #: netbox/virtualization/forms/filtersets.py:37 #: netbox/virtualization/forms/filtersets.py:48 #: netbox/virtualization/forms/filtersets.py:106 @@ -2067,8 +2067,8 @@ msgstr "" msgid "No workers found" msgstr "" -#: netbox/core/views.py:335 netbox/core/views.py:378 netbox/core/views.py:401 -#: netbox/core/views.py:419 netbox/core/views.py:454 +#: netbox/core/views.py:331 netbox/core/views.py:374 netbox/core/views.py:397 +#: netbox/core/views.py:415 netbox/core/views.py:450 #, python-brace-format msgid "Job {job_id} not found" msgstr "" @@ -2946,7 +2946,7 @@ msgstr "" #: netbox/dcim/forms/bulk_create.py:40 netbox/extras/forms/filtersets.py:410 #: netbox/extras/forms/model_forms.py:443 #: netbox/extras/forms/model_forms.py:495 netbox/netbox/forms/base.py:84 -#: netbox/netbox/forms/mixins.py:81 netbox/netbox/tables/columns.py:458 +#: netbox/netbox/forms/mixins.py:81 netbox/netbox/tables/columns.py:461 #: netbox/templates/circuits/inc/circuit_termination.html:32 #: netbox/templates/generic/bulk_edit.html:65 #: netbox/templates/inc/panels/tags.html:5 @@ -5974,7 +5974,7 @@ msgstr "" #: netbox/netbox/navigation/menu.py:60 netbox/netbox/navigation/menu.py:62 #: netbox/virtualization/forms/model_forms.py:122 #: netbox/virtualization/tables/clusters.py:83 -#: netbox/virtualization/views.py:210 +#: netbox/virtualization/views.py:202 msgid "Devices" msgstr "" @@ -6054,8 +6054,8 @@ msgid "Power outlets" msgstr "" #: netbox/dcim/tables/devices.py:243 netbox/dcim/tables/devices.py:1046 -#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:1006 -#: netbox/dcim/views.py:1245 netbox/dcim/views.py:1931 +#: netbox/dcim/tables/devicetypes.py:125 netbox/dcim/views.py:985 +#: netbox/dcim/views.py:1224 netbox/dcim/views.py:1900 #: netbox/netbox/navigation/menu.py:81 netbox/netbox/navigation/menu.py:237 #: netbox/templates/dcim/device/base.html:37 #: netbox/templates/dcim/device_list.html:43 @@ -6067,7 +6067,7 @@ msgstr "" #: netbox/templates/virtualization/virtualmachine/base.html:27 #: netbox/templates/virtualization/virtualmachine_list.html:14 #: netbox/virtualization/tables/virtualmachines.py:100 -#: netbox/virtualization/views.py:367 netbox/wireless/tables/wirelesslan.py:55 +#: netbox/virtualization/views.py:359 netbox/wireless/tables/wirelesslan.py:55 msgid "Interfaces" msgstr "" @@ -6093,8 +6093,8 @@ msgid "Module Bay" msgstr "" #: netbox/dcim/tables/devices.py:310 netbox/dcim/tables/devicetypes.py:48 -#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1081 -#: netbox/dcim/views.py:2024 netbox/netbox/navigation/menu.py:90 +#: netbox/dcim/tables/devicetypes.py:140 netbox/dcim/views.py:1060 +#: netbox/dcim/views.py:1993 netbox/netbox/navigation/menu.py:90 #: netbox/templates/dcim/device/base.html:52 #: netbox/templates/dcim/device_list.html:71 #: netbox/templates/dcim/devicetype/base.html:49 @@ -6124,8 +6124,8 @@ msgid "Allocated draw (W)" msgstr "" #: netbox/dcim/tables/devices.py:546 netbox/ipam/forms/model_forms.py:747 -#: netbox/ipam/tables/fhrp.py:28 netbox/ipam/views.py:602 -#: netbox/ipam/views.py:701 netbox/netbox/navigation/menu.py:145 +#: netbox/ipam/tables/fhrp.py:28 netbox/ipam/views.py:589 +#: netbox/ipam/views.py:688 netbox/netbox/navigation/menu.py:145 #: netbox/netbox/navigation/menu.py:147 #: netbox/templates/dcim/interface.html:339 #: netbox/templates/ipam/ipaddress_bulk_add.html:15 @@ -6218,8 +6218,8 @@ msgstr "" msgid "Instances" msgstr "" -#: netbox/dcim/tables/devicetypes.py:113 netbox/dcim/views.py:946 -#: netbox/dcim/views.py:1185 netbox/dcim/views.py:1871 +#: netbox/dcim/tables/devicetypes.py:113 netbox/dcim/views.py:925 +#: netbox/dcim/views.py:1164 netbox/dcim/views.py:1840 #: netbox/netbox/navigation/menu.py:84 #: netbox/templates/dcim/device/base.html:25 #: netbox/templates/dcim/device_list.html:15 @@ -6229,8 +6229,8 @@ msgstr "" msgid "Console Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:961 -#: netbox/dcim/views.py:1200 netbox/dcim/views.py:1886 +#: netbox/dcim/tables/devicetypes.py:116 netbox/dcim/views.py:940 +#: netbox/dcim/views.py:1179 netbox/dcim/views.py:1855 #: netbox/netbox/navigation/menu.py:85 #: netbox/templates/dcim/device/base.html:28 #: netbox/templates/dcim/device_list.html:22 @@ -6240,8 +6240,8 @@ msgstr "" msgid "Console Server Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:976 -#: netbox/dcim/views.py:1215 netbox/dcim/views.py:1901 +#: netbox/dcim/tables/devicetypes.py:119 netbox/dcim/views.py:955 +#: netbox/dcim/views.py:1194 netbox/dcim/views.py:1870 #: netbox/netbox/navigation/menu.py:86 #: netbox/templates/dcim/device/base.html:31 #: netbox/templates/dcim/device_list.html:29 @@ -6251,8 +6251,8 @@ msgstr "" msgid "Power Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:991 -#: netbox/dcim/views.py:1230 netbox/dcim/views.py:1916 +#: netbox/dcim/tables/devicetypes.py:122 netbox/dcim/views.py:970 +#: netbox/dcim/views.py:1209 netbox/dcim/views.py:1885 #: netbox/netbox/navigation/menu.py:87 #: netbox/templates/dcim/device/base.html:34 #: netbox/templates/dcim/device_list.html:36 @@ -6262,8 +6262,8 @@ msgstr "" msgid "Power Outlets" msgstr "" -#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1021 -#: netbox/dcim/views.py:1260 netbox/dcim/views.py:1952 +#: netbox/dcim/tables/devicetypes.py:128 netbox/dcim/views.py:1000 +#: netbox/dcim/views.py:1239 netbox/dcim/views.py:1921 #: netbox/netbox/navigation/menu.py:82 #: netbox/templates/dcim/device/base.html:40 #: netbox/templates/dcim/devicetype/base.html:37 @@ -6272,8 +6272,8 @@ msgstr "" msgid "Front Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1036 -#: netbox/dcim/views.py:1275 netbox/dcim/views.py:1967 +#: netbox/dcim/tables/devicetypes.py:131 netbox/dcim/views.py:1015 +#: netbox/dcim/views.py:1254 netbox/dcim/views.py:1936 #: netbox/netbox/navigation/menu.py:83 #: netbox/templates/dcim/device/base.html:43 #: netbox/templates/dcim/device_list.html:50 @@ -6283,16 +6283,16 @@ msgstr "" msgid "Rear Ports" msgstr "" -#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1066 -#: netbox/dcim/views.py:2005 netbox/netbox/navigation/menu.py:89 +#: netbox/dcim/tables/devicetypes.py:134 netbox/dcim/views.py:1045 +#: netbox/dcim/views.py:1974 netbox/netbox/navigation/menu.py:89 #: netbox/templates/dcim/device/base.html:49 #: netbox/templates/dcim/device_list.html:57 #: netbox/templates/dcim/devicetype/base.html:46 msgid "Device Bays" msgstr "" -#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1051 -#: netbox/dcim/views.py:1986 netbox/netbox/navigation/menu.py:88 +#: netbox/dcim/tables/devicetypes.py:137 netbox/dcim/views.py:1030 +#: netbox/dcim/views.py:1955 netbox/netbox/navigation/menu.py:88 #: netbox/templates/dcim/device/base.html:46 #: netbox/templates/dcim/device_list.html:64 #: netbox/templates/dcim/devicetype/base.html:43 @@ -6350,38 +6350,38 @@ msgstr "" msgid "Test case must set peer_termination_type" msgstr "" -#: netbox/dcim/views.py:137 +#: netbox/dcim/views.py:139 #, python-brace-format msgid "Disconnected {count} {type}" msgstr "" -#: netbox/dcim/views.py:698 netbox/netbox/navigation/menu.py:28 +#: netbox/dcim/views.py:684 netbox/netbox/navigation/menu.py:28 msgid "Reservations" msgstr "" -#: netbox/dcim/views.py:716 netbox/templates/dcim/location.html:90 +#: netbox/dcim/views.py:702 netbox/templates/dcim/location.html:90 #: netbox/templates/dcim/site.html:140 msgid "Non-Racked Devices" msgstr "" -#: netbox/dcim/views.py:2037 netbox/extras/forms/model_forms.py:453 +#: netbox/dcim/views.py:2006 netbox/extras/forms/model_forms.py:453 #: netbox/templates/extras/configcontext.html:10 #: netbox/virtualization/forms/model_forms.py:225 -#: netbox/virtualization/views.py:407 +#: netbox/virtualization/views.py:399 msgid "Config Context" msgstr "" -#: netbox/dcim/views.py:2047 netbox/virtualization/views.py:417 +#: netbox/dcim/views.py:2016 netbox/virtualization/views.py:409 msgid "Render Config" msgstr "" -#: netbox/dcim/views.py:2097 netbox/extras/tables/tables.py:440 +#: netbox/dcim/views.py:2066 netbox/extras/tables/tables.py:440 #: netbox/netbox/navigation/menu.py:234 netbox/netbox/navigation/menu.py:236 -#: netbox/virtualization/views.py:185 +#: netbox/virtualization/views.py:177 msgid "Virtual Machines" msgstr "" -#: netbox/dcim/views.py:2989 netbox/ipam/tables/ip.py:233 +#: netbox/dcim/views.py:2948 netbox/ipam/tables/ip.py:233 msgid "Children" msgstr "" @@ -9415,7 +9415,7 @@ msgid "The primary function of this VLAN" msgstr "" #: netbox/ipam/models/vlans.py:215 netbox/ipam/tables/ip.py:175 -#: netbox/ipam/tables/vlans.py:78 netbox/ipam/views.py:978 +#: netbox/ipam/tables/vlans.py:78 netbox/ipam/views.py:961 #: netbox/netbox/navigation/menu.py:180 netbox/netbox/navigation/menu.py:182 msgid "VLANs" msgstr "" @@ -9487,7 +9487,7 @@ msgid "Added" msgstr "" #: netbox/ipam/tables/ip.py:127 netbox/ipam/tables/ip.py:165 -#: netbox/ipam/tables/vlans.py:138 netbox/ipam/views.py:349 +#: netbox/ipam/tables/vlans.py:138 netbox/ipam/views.py:342 #: netbox/netbox/navigation/menu.py:152 netbox/netbox/navigation/menu.py:154 #: netbox/templates/ipam/vlan.html:84 msgid "Prefixes" @@ -9588,23 +9588,23 @@ msgid "" "are allowed in DNS names" msgstr "" -#: netbox/ipam/views.py:541 +#: netbox/ipam/views.py:528 msgid "Child Prefixes" msgstr "" -#: netbox/ipam/views.py:576 +#: netbox/ipam/views.py:563 msgid "Child Ranges" msgstr "" -#: netbox/ipam/views.py:902 +#: netbox/ipam/views.py:889 msgid "Related IPs" msgstr "" -#: netbox/ipam/views.py:1133 +#: netbox/ipam/views.py:1116 msgid "Device Interfaces" msgstr "" -#: netbox/ipam/views.py:1150 +#: netbox/ipam/views.py:1133 msgid "VM Interfaces" msgstr "" @@ -10159,7 +10159,7 @@ msgstr "" #: netbox/templates/virtualization/virtualmachine/base.html:32 #: netbox/templates/virtualization/virtualmachine_list.html:21 #: netbox/virtualization/tables/virtualmachines.py:103 -#: netbox/virtualization/views.py:388 +#: netbox/virtualization/views.py:380 msgid "Virtual Disks" msgstr "" @@ -10498,15 +10498,15 @@ msgstr "" msgid "Chinese" msgstr "" -#: netbox/netbox/tables/columns.py:185 +#: netbox/netbox/tables/columns.py:188 msgid "Toggle all" msgstr "" -#: netbox/netbox/tables/columns.py:287 +#: netbox/netbox/tables/columns.py:290 msgid "Toggle Dropdown" msgstr "" -#: netbox/netbox/tables/columns.py:552 netbox/templates/core/job.html:35 +#: netbox/netbox/tables/columns.py:555 netbox/templates/core/job.html:35 msgid "Error" msgstr "" @@ -14072,17 +14072,17 @@ msgstr "" msgid "{value} is not a valid regular expression." msgstr "" -#: netbox/utilities/views.py:40 +#: netbox/utilities/views.py:44 #, python-brace-format msgid "{self.__class__.__name__} must implement get_required_permission()" msgstr "" -#: netbox/utilities/views.py:76 +#: netbox/utilities/views.py:80 #, python-brace-format msgid "{class_name} must implement get_required_permission()" msgstr "" -#: netbox/utilities/views.py:100 +#: netbox/utilities/views.py:104 #, python-brace-format msgid "" "{class_name} has no queryset defined. ObjectPermissionRequiredMixin may only " From b2360b62b51aa4965830b6b19b295a0a9ec79c2f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 14 Jun 2024 10:38:09 -0400 Subject: [PATCH 02/18] Fixes #13925: Support 'zulu' style timestamps for custom fields --- netbox/extras/models/customfields.py | 4 ++++ netbox/utilities/templates/builtins/customfield_value.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/extras/models/customfields.py b/netbox/extras/models/customfields.py index 974affb2e..240998146 100644 --- a/netbox/extras/models/customfields.py +++ b/netbox/extras/models/customfields.py @@ -660,6 +660,10 @@ class CustomField(CloningMixin, ExportTemplatesMixin, ChangeLoggedModel): # Validate date & time elif self.type == CustomFieldTypeChoices.TYPE_DATETIME: if type(value) is not datetime: + # Work around UTC issue for Python < 3.11; see + # https://docs.python.org/3/library/datetime.html#datetime.datetime.fromisoformat + if type(value) is str and value.endswith('Z'): + value = f'{value[:-1]}+00:00' try: datetime.fromisoformat(value) except ValueError: diff --git a/netbox/utilities/templates/builtins/customfield_value.html b/netbox/utilities/templates/builtins/customfield_value.html index 462e62b86..dbf10e1bf 100644 --- a/netbox/utilities/templates/builtins/customfield_value.html +++ b/netbox/utilities/templates/builtins/customfield_value.html @@ -11,7 +11,7 @@ {% elif customfield.type == 'date' and value %} {{ value|isodate }} {% elif customfield.type == 'datetime' and value %} - {{ value|isodate }} {{ value|isodatetime }} + {{ value|isodatetime }} {% elif customfield.type == 'url' and value %} {{ value|truncatechars:70 }} {% elif customfield.type == 'json' and value %} From 49971dd7dbc8da653b31499bb9abb8eb9ebfb68f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 14 Jun 2024 10:56:03 -0400 Subject: [PATCH 03/18] Changelog for #13925, #14829, #15794, #16143, #16256, #16454 --- docs/release-notes/version-4.0.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/release-notes/version-4.0.md b/docs/release-notes/version-4.0.md index ae0578690..647b73231 100644 --- a/docs/release-notes/version-4.0.md +++ b/docs/release-notes/version-4.0.md @@ -2,6 +2,18 @@ ## v4.0.6 (FUTURE) +### Enhancements + +* [#15794](https://github.com/netbox-community/netbox/issues/15794) - Dynamically populate related objects in UI views +* [#16256](https://github.com/netbox-community/netbox/issues/16256) - Enable alphabetical ordering of bookmarks on dashboard + +### Bug Fixes + +* [#13925](https://github.com/netbox-community/netbox/issues/13925) - Fix support for "zulu" (UTC) timestamps for custom fields +* [#14829](https://github.com/netbox-community/netbox/issues/14829) - Fix support for simple conditions (without AND/OR) in event rules +* [#16143](https://github.com/netbox-community/netbox/issues/16143) - Display timestamps in tables in the configured timezone +* [#16454](https://github.com/netbox-community/netbox/issues/16454) - Address DNS lookup bug in `django-debug-toolbar + --- ## v4.0.5 (2024-06-06) From c8aac13ceebf851368f6c7c2fbc6a783fc2e7bda Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 05:02:20 +0000 Subject: [PATCH 04/18] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 26 ++++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 7a60e6028..17636c9e3 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-13 05:02+0000\n" +"POT-Creation-Date: 2024-06-15 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -7686,56 +7686,56 @@ msgstr "" msgid "Date values must be in ISO 8601 format (YYYY-MM-DD)." msgstr "" -#: netbox/extras/models/customfields.py:667 +#: netbox/extras/models/customfields.py:671 msgid "Date and time values must be in ISO 8601 format (YYYY-MM-DD HH:MM:SS)." msgstr "" -#: netbox/extras/models/customfields.py:674 +#: netbox/extras/models/customfields.py:678 #, python-brace-format msgid "Invalid choice ({value}) for choice set {choiceset}." msgstr "" -#: netbox/extras/models/customfields.py:684 +#: netbox/extras/models/customfields.py:688 #, python-brace-format msgid "Invalid choice(s) ({value}) for choice set {choiceset}." msgstr "" -#: netbox/extras/models/customfields.py:693 +#: netbox/extras/models/customfields.py:697 #, python-brace-format msgid "Value must be an object ID, not {type}" msgstr "" -#: netbox/extras/models/customfields.py:699 +#: netbox/extras/models/customfields.py:703 #, python-brace-format msgid "Value must be a list of object IDs, not {type}" msgstr "" -#: netbox/extras/models/customfields.py:703 +#: netbox/extras/models/customfields.py:707 #, python-brace-format msgid "Found invalid object ID: {id}" msgstr "" -#: netbox/extras/models/customfields.py:706 +#: netbox/extras/models/customfields.py:710 msgid "Required field cannot be empty." msgstr "" -#: netbox/extras/models/customfields.py:725 +#: netbox/extras/models/customfields.py:729 msgid "Base set of predefined choices (optional)" msgstr "" -#: netbox/extras/models/customfields.py:737 +#: netbox/extras/models/customfields.py:741 msgid "Choices are automatically ordered alphabetically" msgstr "" -#: netbox/extras/models/customfields.py:744 +#: netbox/extras/models/customfields.py:748 msgid "custom field choice set" msgstr "" -#: netbox/extras/models/customfields.py:745 +#: netbox/extras/models/customfields.py:749 msgid "custom field choice sets" msgstr "" -#: netbox/extras/models/customfields.py:781 +#: netbox/extras/models/customfields.py:785 msgid "Must define base or extra choices." msgstr "" From 6abad9c20c6d3871ae4ead5251ae6fcc35cb14cc Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Fri, 14 Jun 2024 08:32:24 -0700 Subject: [PATCH 05/18] 16586 add .python-version to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 88faab27c..e04e44a30 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ netbox.pid .idea .coverage .vscode +.python-version From 95593495413b7821cbb8fab4603f74c78d9c2354 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 17 Jun 2024 10:58:47 -0400 Subject: [PATCH 06/18] Fixes #16450: Rack unit filter should be case-insensitive --- netbox/dcim/api/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index d6ddd466b..be7a9c306 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -219,9 +219,9 @@ class RackViewSet(NetBoxModelViewSet): ) # Enable filtering rack units by ID - q = data['q'] - if q: - elevation = [u for u in elevation if q in str(u['id']) or q in str(u['name'])] + if q := data['q']: + q = q.lower() + elevation = [u for u in elevation if q in str(u['id']) or q in str(u['name']).lower()] page = self.paginate_queryset(elevation) if page is not None: From 6f35a2ac2b42a43329dd3ebed4d07f257361fbc5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 17 Jun 2024 10:32:47 -0400 Subject: [PATCH 07/18] Fixes #16452: Fix sizing of buttons within object attribute panels --- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/site.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 12ba4a8d4..50136f7a9 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -28,7 +28,7 @@ {% trans "Rack" %} - + {% if object.rack %} {{ object.rack|linkify }} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 1ad0a75ae..ca0937bed 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -73,7 +73,7 @@ {% trans "Physical Address" %} - + {% if object.physical_address %} {{ object.physical_address|linebreaksbr }} {% if config.MAPS_URL %} From b077c664e38cd4fafa7e8faafb8752caa3f53c51 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 17 Jun 2024 09:57:00 -0400 Subject: [PATCH 08/18] Fixes #16542: Fix bulk form operations when HTMX is enabled --- netbox/utilities/templatetags/builtins/tags.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py index bc5c954be..d1dd1a55a 100644 --- a/netbox/utilities/templatetags/builtins/tags.py +++ b/netbox/utilities/templatetags/builtins/tags.py @@ -1,4 +1,5 @@ from django import template +from django.utils.safestring import mark_safe from extras.choices import CustomFieldTypeChoices from utilities.querydict import dict_to_querydict @@ -124,5 +125,5 @@ def formaction(context): if HTMX navigation is enabled (per the user's preferences). """ if context.get('htmx_navigation', False): - return 'hx-push-url="true" hx-post' + return mark_safe('hx-push-url="true" hx-post') return 'formaction' From d2a8e525851c11bb9aa682abf2b724caa0ad9da2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 17 Jun 2024 11:57:01 -0400 Subject: [PATCH 09/18] Fixes #16444: Disable ordering circuits list by A/Z termination --- netbox/circuits/tables/circuits.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/circuits/tables/circuits.py b/netbox/circuits/tables/circuits.py index 5d650df61..e1b99ff42 100644 --- a/netbox/circuits/tables/circuits.py +++ b/netbox/circuits/tables/circuits.py @@ -63,10 +63,12 @@ class CircuitTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): status = columns.ChoiceFieldColumn() termination_a = tables.TemplateColumn( template_code=CIRCUITTERMINATION_LINK, + orderable=False, verbose_name=_('Side A') ) termination_z = tables.TemplateColumn( template_code=CIRCUITTERMINATION_LINK, + orderable=False, verbose_name=_('Side Z') ) commit_rate = CommitRateColumn( From 1eebb98b56ecfc4b3008e34976254261059e507e Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 05:02:24 +0000 Subject: [PATCH 10/18] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 17636c9e3..0cd3741e6 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-15 05:02+0000\n" +"POT-Creation-Date: 2024-06-18 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -158,7 +158,7 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:207 #: netbox/circuits/forms/model_forms.py:136 #: netbox/circuits/forms/model_forms.py:152 -#: netbox/circuits/tables/circuits.py:105 netbox/dcim/forms/bulk_edit.py:167 +#: netbox/circuits/tables/circuits.py:107 netbox/dcim/forms/bulk_edit.py:167 #: netbox/dcim/forms/bulk_edit.py:239 netbox/dcim/forms/bulk_edit.py:575 #: netbox/dcim/forms/bulk_edit.py:771 netbox/dcim/forms/bulk_import.py:130 #: netbox/dcim/forms/bulk_import.py:184 netbox/dcim/forms/bulk_import.py:257 @@ -308,7 +308,7 @@ msgstr "" #: netbox/circuits/forms/filtersets.py:212 #: netbox/circuits/forms/model_forms.py:109 #: netbox/circuits/forms/model_forms.py:131 -#: netbox/circuits/tables/circuits.py:96 netbox/dcim/forms/connections.py:71 +#: netbox/circuits/tables/circuits.py:98 netbox/dcim/forms/connections.py:71 #: netbox/templates/circuits/circuit.html:15 #: netbox/templates/circuits/circuittermination.html:19 #: netbox/templates/dcim/inc/cable_termination.html:55 @@ -469,7 +469,7 @@ msgstr "" #: netbox/circuits/forms/model_forms.py:45 #: netbox/circuits/forms/model_forms.py:59 #: netbox/circuits/forms/model_forms.py:91 -#: netbox/circuits/tables/circuits.py:56 netbox/circuits/tables/circuits.py:100 +#: netbox/circuits/tables/circuits.py:56 netbox/circuits/tables/circuits.py:102 #: netbox/circuits/tables/providers.py:72 #: netbox/circuits/tables/providers.py:103 #: netbox/templates/circuits/circuit.html:18 @@ -748,7 +748,7 @@ msgstr "" #: netbox/circuits/forms/bulk_edit.py:191 #: netbox/circuits/forms/bulk_edit.py:215 #: netbox/circuits/forms/model_forms.py:153 -#: netbox/circuits/tables/circuits.py:109 +#: netbox/circuits/tables/circuits.py:111 #: netbox/templates/circuits/inc/circuit_termination_fields.html:62 #: netbox/templates/circuits/providernetwork.html:17 msgid "Provider Network" @@ -1328,21 +1328,21 @@ msgstr "" msgid "Circuit ID" msgstr "" -#: netbox/circuits/tables/circuits.py:66 +#: netbox/circuits/tables/circuits.py:67 #: netbox/wireless/forms/model_forms.py:160 msgid "Side A" msgstr "" -#: netbox/circuits/tables/circuits.py:70 +#: netbox/circuits/tables/circuits.py:72 msgid "Side Z" msgstr "" -#: netbox/circuits/tables/circuits.py:73 +#: netbox/circuits/tables/circuits.py:75 #: netbox/templates/circuits/circuit.html:55 msgid "Commit Rate" msgstr "" -#: netbox/circuits/tables/circuits.py:76 netbox/circuits/tables/providers.py:48 +#: netbox/circuits/tables/circuits.py:78 netbox/circuits/tables/providers.py:48 #: netbox/circuits/tables/providers.py:82 #: netbox/circuits/tables/providers.py:107 netbox/dcim/tables/devices.py:1001 #: netbox/dcim/tables/devicetypes.py:92 netbox/dcim/tables/modules.py:29 From 973bd0ed75426a907467ad0886e7041e441a595c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 18 Jun 2024 08:17:08 -0400 Subject: [PATCH 11/18] Fixes #16512: Restore a user's preferred language on login (#16628) --- netbox/account/views.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/netbox/account/views.py b/netbox/account/views.py index 40ce78039..feb85fdfe 100644 --- a/netbox/account/views.py +++ b/netbox/account/views.py @@ -104,10 +104,16 @@ class LoginView(View): # Ensure the user has a UserConfig defined. (This should normally be handled by # create_userconfig() on user creation.) if not hasattr(request.user, 'config'): - config = get_config() - UserConfig(user=request.user, data=config.DEFAULT_USER_PREFERENCES).save() + request.user.config = get_config() + UserConfig(user=request.user, data=request.user.config.DEFAULT_USER_PREFERENCES).save() - return self.redirect_to_next(request, logger) + response = self.redirect_to_next(request, logger) + + # Set the user's preferred language (if any) + if language := request.user.config.get('locale.language'): + response.set_cookie(settings.LANGUAGE_COOKIE_NAME, language) + + return response else: logger.debug(f"Login form validation failed for username: {form['username'].value()}") @@ -145,9 +151,10 @@ class LogoutView(View): logger.info(f"User {username} has logged out") messages.info(request, "You have logged out.") - # Delete session key cookie (if set) upon logout + # Delete session key & language cookies (if set) upon logout response = HttpResponseRedirect(resolve_url(settings.LOGOUT_REDIRECT_URL)) response.delete_cookie('session_key') + response.delete_cookie(settings.LANGUAGE_COOKIE_NAME) return response From cd9244fd4f7a74eb1de0dc7a418959e390d49a1f Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Tue, 18 Jun 2024 05:28:18 -0700 Subject: [PATCH 12/18] 16416 enable dark/light toggle in mobile view (#16635) * 16416 enable dark/light toggle in mobile view * 16416 move to inc file --- netbox/templates/base/layout.html | 10 ++-------- netbox/templates/inc/light_toggle.html | 10 ++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 netbox/templates/inc/light_toggle.html diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index d53591cb4..9ba6fded3 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -35,6 +35,7 @@ Blocks: {# User menu (mobile view) #}
+ {% include 'inc/light_toggle.html' %} {% include 'inc/user_menu.html' %}
@@ -52,14 +53,7 @@ Blocks:
{# Dark/light mode toggle #} -
- - -
+ {% include 'inc/light_toggle.html' %} {# User menu #} {% include 'inc/user_menu.html' %} diff --git a/netbox/templates/inc/light_toggle.html b/netbox/templates/inc/light_toggle.html new file mode 100644 index 000000000..7ce9dffca --- /dev/null +++ b/netbox/templates/inc/light_toggle.html @@ -0,0 +1,10 @@ +{% load i18n %} + +
+ + +
From 207c91ef6b1022f10f6f2574a17469f1891908eb Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Mon, 17 Jun 2024 08:51:12 -0700 Subject: [PATCH 13/18] 16460 remove spaces from telephone dialing --- netbox/utilities/tables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index 7f179014a..141ca66d6 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -29,7 +29,7 @@ def linkify_phone(value): """ if value is None: return None - return f"tel:{value}" + return f"tel:{value.replace(' ', '')}" def register_table_column(column, name, *tables): From 81292df04875f8a3cdadf0572355af4ea072fc2d Mon Sep 17 00:00:00 2001 From: Julio Oliveira at Encora <149191228+Julio-Oliveira-Encora@users.noreply.github.com> Date: Tue, 18 Jun 2024 12:58:54 -0300 Subject: [PATCH 14/18] Feature 15348 - Quick Access Saved Filters (#15862) * Added dropdown for Saved Filters. * Added dropdown for Saved Filters. * Added dropdown for Saved Filters. * Fixed linter issues in savedFiltersSelect.ts * Fixed linter issues in netbox.ts * Fixed linter issues in netbox.ts * Removed the blue tag with the filters when saved filters is selected. * Adjusts in table_controls_htmx.html to vertical height of the Quick Search match to the dropdown. * Adjusts in table_controls_htmx.html to vertical height of the Quick Search match to the dropdown. * Adjusts in table_controls_htmx.html to vertical height of the Quick Search match to the dropdown. * Minor adjusts in savedFiltersSelect.ts * Addressed PR comment. * Addressed PR comment. * Addressed PR comment. * Omit saved filters from 'applied filters'; clean up form widget --------- Co-authored-by: Jeremy Stretch --- netbox/project-static/dist/netbox.css | Bin 551835 -> 551938 bytes netbox/project-static/dist/netbox.js | Bin 389990 -> 390360 bytes netbox/project-static/dist/netbox.js.map | Bin 354840 -> 355215 bytes .../src/forms/savedFiltersSelect.ts | 30 ++++++++++++++++++ netbox/project-static/src/netbox.ts | 2 ++ netbox/project-static/styles/netbox.scss | 1 + .../styles/overrides/_tomselect.scss | 8 +++++ netbox/templates/inc/table_controls_htmx.html | 24 ++++++++++---- netbox/utilities/templatetags/helpers.py | 4 +++ 9 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 netbox/project-static/src/forms/savedFiltersSelect.ts create mode 100644 netbox/project-static/styles/overrides/_tomselect.scss diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 0696d2e827f51ae3142a610e546459a4bba62033..36ed4defca8e8ed69115468fac126f7bbb72ce1d 100644 GIT binary patch delta 86 zcmbPzU9stgVnYjK3sVbo3rh=Y3tJ2O77n?n>7Trw#^U|%%3n~;q*tno# k`o}O1IdO%Q%(Cj-#G>@fJSzhQ6QC3b8*G<};;0t{04HJ{CIA2c delta 31 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 delta 8532 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 Gg8mzh5>x;H diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 00b92809a34cefe6dd3a97639f464723e923a6d1..c5cd1a402ff7a61d0ef39a02023dba464333c5fd 100644 GIT binary patch delta 381 zcmY*UKTE?<5U0jW&IO0A0fz$-@dNzcwT2Kws4=v4i}q=PiIp}M!J&hLqhtISPImDd zxC%~w7w_fO!Qqa3zkhe{^{e~x-F_lY4g z*37CjplJj?Y|jl$USesH%O!vE*(SQxUn}rl*(aDYTZb$kn@N6ID4=N7DTRD?+nnU? PwE5^cJL~t{z3BV` option.selected) + .map(option => `filter_id=${option.value}`) + .join('&'); + + baseUrl += `${preFilter}${selectedOptions}`; + document.location.href = baseUrl; +} + +export function initSavedFilterSelect(): void { + const divResults = document.getElementById('results'); + if (isTruthy(divResults)) { + const savedFilterSelect = document.getElementById('id_filter_id'); + if (isTruthy(savedFilterSelect)) { + savedFilterSelect.addEventListener('change', handleSavedFilterChange); + } + } +} diff --git a/netbox/project-static/src/netbox.ts b/netbox/project-static/src/netbox.ts index 59faab222..ce0aad93f 100644 --- a/netbox/project-static/src/netbox.ts +++ b/netbox/project-static/src/netbox.ts @@ -13,6 +13,7 @@ import { initSideNav } from './sidenav'; import { initDashboard } from './dashboard'; import { initRackElevation } from './racks'; import { initHtmx } from './htmx'; +import { initSavedFilterSelect } from './forms/savedFiltersSelect'; function initDocument(): void { for (const init of [ @@ -31,6 +32,7 @@ function initDocument(): void { initDashboard, initRackElevation, initHtmx, + initSavedFilterSelect, ]) { init(); } diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index b04b85fc9..af2905312 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -7,6 +7,7 @@ // Overrides of external libraries @import 'overrides/bootstrap'; @import 'overrides/tabler'; +@import 'overrides/tomselect'; // Transitional styling to ease migration of templates from NetBox v3.x @import 'transitional/badges'; diff --git a/netbox/project-static/styles/overrides/_tomselect.scss b/netbox/project-static/styles/overrides/_tomselect.scss new file mode 100644 index 000000000..29aa9d361 --- /dev/null +++ b/netbox/project-static/styles/overrides/_tomselect.scss @@ -0,0 +1,8 @@ +.ts-wrapper.multi { + .ts-control { + padding: 7px 7px 3px 7px; + div { + margin: 0 4px 4px 0; + } + } +} diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html index bbbcff59c..ec913d32a 100644 --- a/netbox/templates/inc/table_controls_htmx.html +++ b/netbox/templates/inc/table_controls_htmx.html @@ -1,25 +1,37 @@ {% load helpers %} {% load i18n %} -
+
- + - {% block extra_table_controls %}{% endblock %} + {% block extra_table_controls %}{% endblock %}
+ +
+
+
+ +
+ {{ filter_form.filter_id }} +
+
+
{% if request.user.is_authenticated and table_modal %}
-
{% endif %}
+ diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index b9a3e0005..3595c0666 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -281,6 +281,10 @@ def applied_filters(context, model, form, query_params): if filter_name not in querydict: continue + # Skip saved filters, as they're displayed alongside the quick search widget + if filter_name == 'filter_id': + continue + bound_field = form.fields[filter_name].get_bound_field(form, filter_name) querydict.pop(filter_name) display_value = ', '.join([str(v) for v in get_selected_values(form, filter_name)]) From 9d28af42b2187a7be82084717b7123d77988de8c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 18 Jun 2024 13:33:05 -0400 Subject: [PATCH 15/18] Update changelog for #15348, #16416, #16444, #16450, #16452, #16460, #16512, #16542 --- docs/release-notes/version-4.0.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/release-notes/version-4.0.md b/docs/release-notes/version-4.0.md index 647b73231..9ca245e04 100644 --- a/docs/release-notes/version-4.0.md +++ b/docs/release-notes/version-4.0.md @@ -4,6 +4,7 @@ ### Enhancements +* [#15348](https://github.com/netbox-community/netbox/issues/15348) - Show saved filters alongside quick search on object list views * [#15794](https://github.com/netbox-community/netbox/issues/15794) - Dynamically populate related objects in UI views * [#16256](https://github.com/netbox-community/netbox/issues/16256) - Enable alphabetical ordering of bookmarks on dashboard @@ -12,7 +13,14 @@ * [#13925](https://github.com/netbox-community/netbox/issues/13925) - Fix support for "zulu" (UTC) timestamps for custom fields * [#14829](https://github.com/netbox-community/netbox/issues/14829) - Fix support for simple conditions (without AND/OR) in event rules * [#16143](https://github.com/netbox-community/netbox/issues/16143) - Display timestamps in tables in the configured timezone +* [#16416](https://github.com/netbox-community/netbox/issues/16416) - Retain dark/light mode toggle on mobile view +* [#16444](https://github.com/netbox-community/netbox/issues/16444) - Disable ordering circuits list by A/Z termination +* [#16450](https://github.com/netbox-community/netbox/issues/16450) - Searching for rack unit in form dropdown should be case-insensitive +* [#16452](https://github.com/netbox-community/netbox/issues/16452) - Fix sizing of buttons within object attribute panels * [#16454](https://github.com/netbox-community/netbox/issues/16454) - Address DNS lookup bug in `django-debug-toolbar +* [#16460](https://github.com/netbox-community/netbox/issues/16460) - Omit spaces from telephone number URLs +* [#16512](https://github.com/netbox-community/netbox/issues/16512) - Restore a user's preferred language (if any) on login +* [#16542](https://github.com/netbox-community/netbox/issues/16542) - Fix bulk form operations when HTMX is enabled --- From 7a5e8a80eafbd677db0f9cf7a91a94fe92ba5774 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 19 Jun 2024 05:02:34 +0000 Subject: [PATCH 16/18] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 44 ++++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 0cd3741e6..1cd28b2bc 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-18 05:02+0000\n" +"POT-Creation-Date: 2024-06-19 05:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -58,7 +58,7 @@ msgstr "" msgid "Allowed IPs" msgstr "" -#: netbox/account/views.py:197 +#: netbox/account/views.py:204 msgid "Your preferences have been updated." msgstr "" @@ -10790,36 +10790,28 @@ msgstr "" msgid "NetBox Logo" msgstr "" -#: netbox/templates/base/layout.html:56 -msgid "Enable dark mode" -msgstr "" - -#: netbox/templates/base/layout.html:59 -msgid "Enable light mode" -msgstr "" - -#: netbox/templates/base/layout.html:145 +#: netbox/templates/base/layout.html:139 msgid "Docs" msgstr "" -#: netbox/templates/base/layout.html:151 +#: netbox/templates/base/layout.html:145 #: netbox/templates/rest_framework/api.html:10 msgid "REST API" msgstr "" -#: netbox/templates/base/layout.html:157 +#: netbox/templates/base/layout.html:151 msgid "REST API documentation" msgstr "" -#: netbox/templates/base/layout.html:164 +#: netbox/templates/base/layout.html:158 msgid "GraphQL API" msgstr "" -#: netbox/templates/base/layout.html:171 +#: netbox/templates/base/layout.html:165 msgid "Source Code" msgstr "" -#: netbox/templates/base/layout.html:177 +#: netbox/templates/base/layout.html:171 msgid "Community" msgstr "" @@ -11112,8 +11104,8 @@ msgstr "" #: netbox/templates/core/rq_worker_list.html:45 #: netbox/templates/extras/script_result.html:49 #: netbox/templates/extras/script_result.html:51 -#: netbox/templates/inc/table_controls_htmx.html:18 -#: netbox/templates/inc/table_controls_htmx.html:20 +#: netbox/templates/inc/table_controls_htmx.html:28 +#: netbox/templates/inc/table_controls_htmx.html:31 msgid "Configure Table" msgstr "" @@ -12689,6 +12681,14 @@ msgstr "" msgid "Reset" msgstr "" +#: netbox/templates/inc/light_toggle.html:4 +msgid "Enable dark mode" +msgstr "" + +#: netbox/templates/inc/light_toggle.html:7 +msgid "Enable light mode" +msgstr "" + #: netbox/templates/inc/missing_prerequisites.html:8 #, python-format msgid "" @@ -12729,6 +12729,14 @@ msgstr "" msgid "Data is out of sync with upstream file" msgstr "" +#: netbox/templates/inc/table_controls_htmx.html:7 +msgid "Quick search" +msgstr "" + +#: netbox/templates/inc/table_controls_htmx.html:19 +msgid "Saved filter" +msgstr "" + #: netbox/templates/inc/user_menu.html:23 msgid "Django Admin" msgstr "" From 32e219c70affffce72161b9acea67b7b42a1029f Mon Sep 17 00:00:00 2001 From: Jeff Gehlbach Date: Thu, 20 Jun 2024 08:53:57 -0400 Subject: [PATCH 17/18] Interim fix to SECURITY.md: Remove non-working email address --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index c434b6110..4ca6ef33a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -24,7 +24,7 @@ If you believe you've uncovered a security vulnerability and wish to report it c Please note that we **DO NOT** accept reports generated by automated tooling which merely suggest that a file or file(s) _may_ be vulnerable under certain conditions, as these are most often innocuous. -If you believe that you've found a vulnerability which meets all of these conditions, please [submit a draft security advisory](https://github.com/netbox-community/netbox/security/advisories/new) on GitHub, or email a brief description of the suspected bug and instructions for reproduction to **security@netbox.dev**. For any security concerns regarding NetBox deployed via Docker, please see the [netbox-docker](https://github.com/netbox-community/netbox-docker) project. +If you believe that you've found a vulnerability which meets all of these conditions, please [submit a draft security advisory](https://github.com/netbox-community/netbox/security/advisories/new) on GitHub. For any security concerns regarding NetBox deployed via Docker, please see the [netbox-docker](https://github.com/netbox-community/netbox-docker) project. ### Bug Bounties From 582ede8ed33838554c05c61d7acb5789d6db6012 Mon Sep 17 00:00:00 2001 From: Ryan Gillespie <24619595+nopg@users.noreply.github.com> Date: Thu, 20 Jun 2024 08:59:17 -0600 Subject: [PATCH 18/18] Fixes #15717 - Unable to assign a VM in Site to Cluster without Site (#15763) * Fixes #15717: Allow VM with Site to Cluster without Site * Fixes #15717: Allow VM with Site to Cluster without Site * Fixes #15717: Allow VM with Site to Cluster without Site * Fixes #15717: Allow VM with Site to Cluster without Site * Fixes #15717: Allow VM with Site to Cluster without Site --- netbox/dcim/forms/model_forms.py | 5 ++- netbox/dcim/tests/test_models.py | 31 +++++++++++++++++++ netbox/virtualization/forms/model_forms.py | 4 +-- .../virtualization/models/virtualmachines.py | 2 +- netbox/virtualization/tests/test_models.py | 3 ++ 5 files changed, 41 insertions(+), 4 deletions(-) diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py index d5cc0e856..c12ddccde 100644 --- a/netbox/dcim/forms/model_forms.py +++ b/netbox/dcim/forms/model_forms.py @@ -465,7 +465,10 @@ class DeviceForm(TenancyForm, NetBoxModelForm): label=_('Cluster'), queryset=Cluster.objects.all(), required=False, - selector=True + selector=True, + query_params={ + 'site_id': ['$site', 'null'] + }, ) comments = CommentField() local_context_data = JSONField( diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py index cab1760ed..9056a66c0 100644 --- a/netbox/dcim/tests/test_models.py +++ b/netbox/dcim/tests/test_models.py @@ -8,6 +8,7 @@ from dcim.models import * from extras.models import CustomField from tenancy.models import Tenant from utilities.data import drange +from virtualization.models import Cluster, ClusterType class LocationTestCase(TestCase): @@ -533,6 +534,36 @@ class DeviceTestCase(TestCase): device2.full_clean() device2.save() + def test_device_mismatched_site_cluster(self): + cluster_type = ClusterType.objects.create(name='Cluster Type 1', slug='cluster-type-1') + Cluster.objects.create(name='Cluster 1', type=cluster_type) + + sites = ( + Site(name='Site 1', slug='site-1'), + Site(name='Site 2', slug='site-2'), + ) + Site.objects.bulk_create(sites) + + clusters = ( + Cluster(name='Cluster 1', type=cluster_type, site=sites[0]), + Cluster(name='Cluster 2', type=cluster_type, site=sites[1]), + Cluster(name='Cluster 3', type=cluster_type, site=None), + ) + Cluster.objects.bulk_create(clusters) + + device_type = DeviceType.objects.first() + device_role = DeviceRole.objects.first() + + # Device with site only should pass + Device(name='device1', site=sites[0], device_type=device_type, role=device_role).full_clean() + + # Device with site, cluster non-site should pass + Device(name='device1', site=sites[0], device_type=device_type, role=device_role, cluster=clusters[2]).full_clean() + + # Device with mismatched site & cluster should fail + with self.assertRaises(ValidationError): + Device(name='device1', site=sites[0], device_type=device_type, role=device_role, cluster=clusters[1]).full_clean() + class CableTestCase(TestCase): diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py index bfdfc9ada..5ea8a4614 100644 --- a/netbox/virtualization/forms/model_forms.py +++ b/netbox/virtualization/forms/model_forms.py @@ -178,8 +178,8 @@ class VirtualMachineForm(TenancyForm, NetBoxModelForm): required=False, selector=True, query_params={ - 'site_id': '$site', - } + 'site_id': ['$site', 'null'] + }, ) device = DynamicModelChoiceField( label=_('Device'), diff --git a/netbox/virtualization/models/virtualmachines.py b/netbox/virtualization/models/virtualmachines.py index 92f1a9472..2ca1599bf 100644 --- a/netbox/virtualization/models/virtualmachines.py +++ b/netbox/virtualization/models/virtualmachines.py @@ -180,7 +180,7 @@ class VirtualMachine(ContactsMixin, ImageAttachmentsMixin, RenderConfigMixin, Co }) # Validate site for cluster & device - if self.cluster and self.site and self.cluster.site != self.site: + if self.cluster and self.cluster.site is not None and self.cluster.site != self.site: raise ValidationError({ 'cluster': _( 'The selected cluster ({cluster}) is not assigned to this site ({site}).' diff --git a/netbox/virtualization/tests/test_models.py b/netbox/virtualization/tests/test_models.py index c94ff930e..a4e8d7947 100644 --- a/netbox/virtualization/tests/test_models.py +++ b/netbox/virtualization/tests/test_models.py @@ -63,6 +63,9 @@ class VirtualMachineTestCase(TestCase): # VM with site only should pass VirtualMachine(name='vm1', site=sites[0]).full_clean() + # VM with site, cluster non-site should pass + VirtualMachine(name='vm1', site=sites[0], cluster=clusters[2]).full_clean() + # VM with non-site cluster only should pass VirtualMachine(name='vm1', cluster=clusters[2]).full_clean()