From be344369de26de12b0a3499a9d0599d97b124d63 Mon Sep 17 00:00:00 2001 From: kkthxbye-code Date: Mon, 1 May 2023 08:18:13 +0200 Subject: [PATCH] When bulk-importing related objects, add the errors to the base form instead of the model_form --- netbox/netbox/views/generic/bulk_views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index e66e79a7a..bac63b941 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -313,7 +313,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView): """ return data - def _save_object(self, model_form, request): + def _save_object(self, model_form, request, form): # Save the primary object obj = self.save_object(model_form, request) @@ -342,7 +342,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView): for subfield_name, errors in f.errors.items(): for err in errors: err_msg = "{}[{}] {}: {}".format(field_name, i, subfield_name, err) - model_form.add_error(None, err_msg) + form.add_error(None, err_msg) raise AbortTransaction() # Enforce object-level permissions on related objects @@ -405,7 +405,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView): restrict_form_fields(model_form, request.user) if model_form.is_valid(): - obj = self._save_object(model_form, request) + obj = self._save_object(model_form, request, form) saved_objects.append(obj) else: # Replicate model form errors for display