diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index da0a34987..743f957c1 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -15,6 +15,7 @@ * [#8564](https://github.com/netbox-community/netbox/issues/8564) - Fix errant table configuration key `available_columns` * [#8578](https://github.com/netbox-community/netbox/issues/8578) - Object change log tables should honor user's configured preferences * [#8604](https://github.com/netbox-community/netbox/issues/8604) - Fix tag filter on config context list filter form +* [#8611](https://github.com/netbox-community/netbox/issues/8611) - Fix bulk editing for certain custom link, webhook, and journal entry fields --- diff --git a/netbox/extras/forms/bulk_edit.py b/netbox/extras/forms/bulk_edit.py index 45b48e9a2..5bae76a94 100644 --- a/netbox/extras/forms/bulk_edit.py +++ b/netbox/extras/forms/bulk_edit.py @@ -4,7 +4,9 @@ from django.contrib.contenttypes.models import ContentType from extras.choices import * from extras.models import * from extras.utils import FeatureQuery -from utilities.forms import BulkEditForm, BulkEditNullBooleanSelect, ColorField, ContentTypeChoiceField, StaticSelect +from utilities.forms import ( + add_blank_choice, BulkEditForm, BulkEditNullBooleanSelect, ColorField, ContentTypeChoiceField, StaticSelect, +) __all__ = ( 'ConfigContextBulkEditForm', @@ -55,7 +57,7 @@ class CustomLinkBulkEditForm(BulkEditForm): required=False ) button_class = forms.ChoiceField( - choices=CustomLinkButtonClassChoices, + choices=add_blank_choice(CustomLinkButtonClassChoices), required=False, widget=StaticSelect() ) @@ -117,21 +119,25 @@ class WebhookBulkEditForm(BulkEditForm): widget=BulkEditNullBooleanSelect() ) http_method = forms.ChoiceField( - choices=WebhookHttpMethodChoices, - required=False + choices=add_blank_choice(WebhookHttpMethodChoices), + required=False, + label='HTTP method' ) payload_url = forms.CharField( - required=False + required=False, + label='Payload URL' ) ssl_verification = forms.NullBooleanField( required=False, - widget=BulkEditNullBooleanSelect() + widget=BulkEditNullBooleanSelect(), + label='SSL verification' ) secret = forms.CharField( required=False ) ca_file_path = forms.CharField( - required=False + required=False, + label='CA file path' ) class Meta: @@ -185,7 +191,7 @@ class JournalEntryBulkEditForm(BulkEditForm): widget=forms.MultipleHiddenInput ) kind = forms.ChoiceField( - choices=JournalEntryKindChoices, + choices=add_blank_choice(JournalEntryKindChoices), required=False ) comments = forms.CharField(