mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #8611: Fix bulk editing for certain custom link, webhook, and journal entry fields

Browse Source
This commit is contained in:
jeremystretch
2022-02-11 15:34:41 -05:00
parent e1ef911d40
commit f11ad99983
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.1.md
View File

@ -15,6 +15,7 @@
* [#8564](https://github.com/netbox-community/netbox/issues/8564) - Fix errant table configuration key `available_columns` * [#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 * [#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 * [#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
--- ---

22
netbox/extras/forms/bulk_edit.py
View File

@ -4,7 +4,9 @@ from django.contrib.contenttypes.models import ContentType
from extras.choices import * from extras.choices import *
from extras.models import * from extras.models import *
from extras.utils import FeatureQuery 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__ = ( __all__ = (
'ConfigContextBulkEditForm', 'ConfigContextBulkEditForm',
@ -55,7 +57,7 @@ class CustomLinkBulkEditForm(BulkEditForm):
required=False required=False
) )
button_class = forms.ChoiceField( button_class = forms.ChoiceField(
choices=CustomLinkButtonClassChoices, choices=add_blank_choice(CustomLinkButtonClassChoices),
required=False, required=False,
widget=StaticSelect() widget=StaticSelect()
) )
@ -117,21 +119,25 @@ class WebhookBulkEditForm(BulkEditForm):
widget=BulkEditNullBooleanSelect() widget=BulkEditNullBooleanSelect()
) )
http_method = forms.ChoiceField( http_method = forms.ChoiceField(
choices=WebhookHttpMethodChoices, choices=add_blank_choice(WebhookHttpMethodChoices),
required=False required=False,
label='HTTP method'
) )
payload_url = forms.CharField( payload_url = forms.CharField(
required=False required=False,
label='Payload URL'
) )
ssl_verification = forms.NullBooleanField( ssl_verification = forms.NullBooleanField(
required=False, required=False,
widget=BulkEditNullBooleanSelect() widget=BulkEditNullBooleanSelect(),
label='SSL verification'
) )
secret = forms.CharField( secret = forms.CharField(
required=False required=False
) )
ca_file_path = forms.CharField( ca_file_path = forms.CharField(
required=False required=False,
label='CA file path'
) )
class Meta: class Meta:
@ -185,7 +191,7 @@ class JournalEntryBulkEditForm(BulkEditForm):
widget=forms.MultipleHiddenInput widget=forms.MultipleHiddenInput
) )
kind = forms.ChoiceField( kind = forms.ChoiceField(
choices=JournalEntryKindChoices, choices=add_blank_choice(JournalEntryKindChoices),
required=False required=False
) )
comments = forms.CharField( comments = forms.CharField(