NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixed error display on parent import form (#15213)

Browse Source 
* fixed error display on parent import form #15185

* Rename parent_form; handle errors assigned to __all__

---------

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
Abhimanyu Saharan 2024-02-21 10:50:09 -08:00 committed by GitHub
parent 1780acc8a6
commit f14eac58e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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, 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__':
model_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
@ -417,7 +420,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
restrict_form_fields(model_form, request.user) restrict_form_fields(model_form, request.user)
if model_form.is_valid(): if model_form.is_valid():
obj = self._save_object(model_form, request) obj = self._save_object(form, model_form, request)
saved_objects.append(obj) saved_objects.append(obj)
else: else:
# Replicate model form errors for display # Replicate model form errors for display