From edc985222907236beb6800d6c34e48eb3973970e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 10 Dec 2024 13:15:47 -0500 Subject: [PATCH] Fixes #18194: Always pass POST data to bulk edit form --- netbox/netbox/views/generic/bulk_views.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 456dd67d2..8e5fbb884 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -661,15 +661,13 @@ class BulkEditView(GetReturnURLMixin, BaseMultiObjectView): elif 'virtual_machine' in request.GET: initial_data['virtual_machine'] = request.GET.get('virtual_machine') - if '_apply' in request.POST: - form = self.form(request.POST, initial=initial_data) - restrict_form_fields(form, request.user) + form = self.form(request.POST, initial=initial_data) + restrict_form_fields(form, request.user) + if '_apply' in request.POST: if form.is_valid(): logger.debug("Form validation was successful") - try: - with transaction.atomic(): updated_objects = self._update_objects(form, request) @@ -697,10 +695,6 @@ class BulkEditView(GetReturnURLMixin, BaseMultiObjectView): else: logger.debug("Form validation failed") - else: - form = self.form(initial=initial_data) - restrict_form_fields(form, request.user) - # Retrieve objects being edited table = self.table(self.queryset.filter(pk__in=pk_list), orderable=False) if not table.rows: