From 7b374e4cf6f6d4611b79a521640097b4988bc2f2 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 19 Apr 2023 17:25:32 -0400 Subject: [PATCH 1/2] Fixes #12296: Fix 'mark connected' form field for bulk editing front & rear ports --- docs/release-notes/version-3.4.md | 4 ++++ netbox/dcim/forms/bulk_edit.py | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/docs/release-notes/version-3.4.md b/docs/release-notes/version-3.4.md index 9b470481a..f8a92e6bf 100644 --- a/docs/release-notes/version-3.4.md +++ b/docs/release-notes/version-3.4.md @@ -2,6 +2,10 @@ ## v3.4.9 (FUTURE) +### Bug Fixes + +* [#12296](https://github.com/netbox-community/netbox/issues/12296) - Fix "mark connected" form field for bulk editing front & rear ports + --- ## v3.4.8 (2023-04-12) diff --git a/netbox/dcim/forms/bulk_edit.py b/netbox/dcim/forms/bulk_edit.py index 24bd3e62d..9388f5cd3 100644 --- a/netbox/dcim/forms/bulk_edit.py +++ b/netbox/dcim/forms/bulk_edit.py @@ -1324,6 +1324,11 @@ class FrontPortBulkEditForm( form_from_model(FrontPort, ['label', 'type', 'color', 'mark_connected', 'description']), ComponentBulkEditForm ): + mark_connected = forms.NullBooleanField( + required=False, + widget=BulkEditNullBooleanSelect + ) + model = FrontPort fieldsets = ( (None, ('module', 'type', 'label', 'color', 'description', 'mark_connected')), @@ -1335,6 +1340,11 @@ class RearPortBulkEditForm( form_from_model(RearPort, ['label', 'type', 'color', 'mark_connected', 'description']), ComponentBulkEditForm ): + mark_connected = forms.NullBooleanField( + required=False, + widget=BulkEditNullBooleanSelect + ) + model = RearPort fieldsets = ( (None, ('module', 'type', 'label', 'color', 'description', 'mark_connected')), From 164b2a50163133b36a4a9755e38c658048434fd9 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Wed, 19 Apr 2023 17:41:38 -0400 Subject: [PATCH 2/2] Fixes #12270: Fix pre-population of list values when creating a saved filter --- docs/release-notes/version-3.4.md | 1 + netbox/utilities/templatetags/helpers.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-3.4.md b/docs/release-notes/version-3.4.md index f8a92e6bf..60f09c2b5 100644 --- a/docs/release-notes/version-3.4.md +++ b/docs/release-notes/version-3.4.md @@ -4,6 +4,7 @@ ### Bug Fixes +* [#12270](https://github.com/netbox-community/netbox/issues/12270) - Fix pre-population of list values when creating a saved filter * [#12296](https://github.com/netbox-community/netbox/issues/12296) - Fix "mark connected" form field for bulk editing front & rear ports --- diff --git a/netbox/utilities/templatetags/helpers.py b/netbox/utilities/templatetags/helpers.py index 6cdf33dd1..471413bf0 100644 --- a/netbox/utilities/templatetags/helpers.py +++ b/netbox/utilities/templatetags/helpers.py @@ -322,7 +322,7 @@ def applied_filters(context, model, form, query_params): save_link = None if user.has_perm('extras.add_savedfilter') and 'filter_id' not in context['request'].GET: content_type = ContentType.objects.get_for_model(model).pk - parameters = json.dumps(context['request'].GET) + parameters = json.dumps(dict(context['request'].GET.lists())) url = reverse('extras:savedfilter_add') save_link = f"{url}?content_types={content_type}¶meters={quote(parameters)}"