NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-17 04:58:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Rename parent_form; handle errors assigned to __all__

Browse Source
This commit is contained in:
Jeremy Stretch 2024-02-21 13:37:00 -05:00
parent 2a14c13270
commit 6a15c8ada8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/netbox/views/generic/bulk_views.py
View File

@ -321,7 +321,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
if type(field.widget) is not HiddenInput if type(field.widget) is not HiddenInput
} }
def _save_object(self, parent_form, model_form, request): def _save_object(self, import_form, model_form, request):
# Save the primary object # Save the primary object
obj = self.save_object(model_form, request) obj = self.save_object(model_form, request)
@ -346,11 +346,14 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
related_obj = f.save() related_obj = f.save()
related_obj_pks.append(related_obj.pk) related_obj_pks.append(related_obj.pk)
else: else:
# Replicate errors on the related object form to the primary form for display # Replicate errors on the related object form to the import form for display and abort
for subfield_name, errors in f.errors.items(): for subfield_name, errors in f.errors.items():
for err in errors: for err in errors:
err_msg = "{}[{}] {}: {}".format(field_name, i, subfield_name, err) if subfield_name == '__all__':
parent_form.add_error(None, err_msg) err_msg = f"{field_name}[{i}]: {err}"
else:
err_msg = f"{field_name}[{i}] {subfield_name}: {err}"
import_form.add_error(None, err_msg)
raise AbortTransaction() raise AbortTransaction()
# Enforce object-level permissions on related objects # Enforce object-level permissions on related objects