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

Fix up bulk editing forms

Browse Source
This commit is contained in:
Jeremy Stretch
2020-02-06 15:51:51 -05:00
parent 1b5969a5ee
commit 17e0054941
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
netbox/dcim/forms.py
View File

@ -1065,6 +1065,7 @@ class ConsolePortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
) )
type = forms.ChoiceField( type = forms.ChoiceField(
choices=add_blank_choice(ConsolePortTypeChoices), choices=add_blank_choice(ConsolePortTypeChoices),
required=False,
widget=StaticSelect2() widget=StaticSelect2()
) )
@ -1107,6 +1108,7 @@ class ConsoleServerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
) )
type = forms.ChoiceField( type = forms.ChoiceField(
choices=add_blank_choice(ConsolePortTypeChoices), choices=add_blank_choice(ConsolePortTypeChoices),
required=False,
widget=StaticSelect2() widget=StaticSelect2()
) )
@ -1159,7 +1161,8 @@ class PowerPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
) )
type = forms.ChoiceField( type = forms.ChoiceField(
choices=add_blank_choice(PowerPortTypeChoices), choices=add_blank_choice(PowerPortTypeChoices),
required=False required=False,
widget=StaticSelect2()
) )
maximum_draw = forms.IntegerField( maximum_draw = forms.IntegerField(
min_value=1, min_value=1,
@ -1241,7 +1244,8 @@ class PowerOutletTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
) )
type = forms.ChoiceField( type = forms.ChoiceField(
choices=add_blank_choice(PowerOutletTypeChoices), choices=add_blank_choice(PowerOutletTypeChoices),
required=False required=False,
widget=StaticSelect2()
) )
feed_leg = forms.ChoiceField( feed_leg = forms.ChoiceField(
choices=add_blank_choice(PowerOutletFeedLegChoices), choices=add_blank_choice(PowerOutletFeedLegChoices),
@ -1401,12 +1405,13 @@ class FrontPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
widget=forms.MultipleHiddenInput() widget=forms.MultipleHiddenInput()
) )
type = forms.ChoiceField( type = forms.ChoiceField(
choices=PortTypeChoices, choices=add_blank_choice(PortTypeChoices),
required=False,
widget=StaticSelect2() widget=StaticSelect2()
) )
class Meta: class Meta:
nullable_fields = ('type',) nullable_fields = ()
class RearPortTemplateForm(BootstrapMixin, forms.ModelForm): class RearPortTemplateForm(BootstrapMixin, forms.ModelForm):
@ -1450,12 +1455,13 @@ class RearPortTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
widget=forms.MultipleHiddenInput() widget=forms.MultipleHiddenInput()
) )
type = forms.ChoiceField( type = forms.ChoiceField(
choices=PortTypeChoices, choices=add_blank_choice(PortTypeChoices),
required=False,
widget=StaticSelect2() widget=StaticSelect2()
) )
class Meta: class Meta:
nullable_fields = ('type',) nullable_fields = ()
class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm): class DeviceBayTemplateForm(BootstrapMixin, forms.ModelForm):
@ -1482,6 +1488,7 @@ class DeviceBayTemplateCreateForm(BootstrapMixin, forms.Form):
) )
# TODO: DeviceBayTemplate has no fields suitable for bulk-editing yet
# class DeviceBayTemplateBulkEditForm(BootstrapMixin, BulkEditForm): # class DeviceBayTemplateBulkEditForm(BootstrapMixin, BulkEditForm):
# pk = forms.ModelMultipleChoiceField( # pk = forms.ModelMultipleChoiceField(
# queryset=FrontPortTemplate.objects.all(), # queryset=FrontPortTemplate.objects.all(),

2
netbox/utilities/utils.py
View File

@ -219,6 +219,6 @@ def querydict_to_dict(querydict):
""" """
assert isinstance(querydict, QueryDict) assert isinstance(querydict, QueryDict)
return { return {
key: querydict.get(key) if len(value) == 1 else querydict.getlist(key) key: querydict.get(key) if len(value) == 1 and key != 'pk' else querydict.getlist(key)
for key, value in querydict.lists() for key, value in querydict.lists()
} }