Fixes #4079: Fix assignment of power panel when bulk editing power feeds

This commit is contained in:
Jeremy Stretch 2020-02-03 14:34:47 -05:00
parent 91929aae1b
commit eef79e1443
3 changed files with 2 additions and 4 deletions

View File

@ -14,6 +14,7 @@
* [#4056](https://github.com/netbox-community/netbox/issues/4056) - Repair schema migration for Rack.outer_unit (from #3569) * [#4056](https://github.com/netbox-community/netbox/issues/4056) - Repair schema migration for Rack.outer_unit (from #3569)
* [#4067](https://github.com/netbox-community/netbox/issues/4067) - Correct permission checked when creating a rack (vs. editing) * [#4067](https://github.com/netbox-community/netbox/issues/4067) - Correct permission checked when creating a rack (vs. editing)
* [#4071](https://github.com/netbox-community/netbox/issues/4071) - Enforce "view tag" permission on individual tag view * [#4071](https://github.com/netbox-community/netbox/issues/4071) - Enforce "view tag" permission on individual tag view
* [#4079](https://github.com/netbox-community/netbox/issues/4079) - Fix assignment of power panel when bulk editing power feeds
--- ---

View File

@ -4371,7 +4371,7 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
queryset=PowerFeed.objects.all(), queryset=PowerFeed.objects.all(),
widget=forms.MultipleHiddenInput widget=forms.MultipleHiddenInput
) )
powerpanel = forms.ModelChoiceField( power_panel = forms.ModelChoiceField(
queryset=PowerPanel.objects.all(), queryset=PowerPanel.objects.all(),
required=False, required=False,
widget=APISelect( widget=APISelect(

View File

@ -1331,9 +1331,6 @@ class PowerPanelTestCase(StandardTestCases.Views):
class PowerFeedTestCase(StandardTestCases.Views): class PowerFeedTestCase(StandardTestCases.Views):
model = PowerFeed model = PowerFeed
# TODO: Re-enable this test once #4079 is fixed
test_bulk_edit_objects = None
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):