Fixes #11617: Check for invalid CSV headers during bulk import

This commit is contained in:
Jeremy Stretch 2023-09-19 15:59:14 -04:00
parent a08b5793f6
commit 06cb1400d0
2 changed files with 13 additions and 10 deletions

View File

@ -129,6 +129,7 @@ class BulkImportForm(BootstrapMixin, SyncedDataMixin, forms.Form):
headers, records = parse_csv(reader) headers, records = parse_csv(reader)
# Set CSV headers for reference by the model form # Set CSV headers for reference by the model form
headers.pop('id', None)
self._csv_headers = headers self._csv_headers = headers
return records return records

View File

@ -70,22 +70,24 @@ class CSVModelForm(forms.ModelForm):
""" """
ModelForm used for the import of objects in CSV format. ModelForm used for the import of objects in CSV format.
""" """
def __init__(self, *args, headers=None, fields=None, **kwargs): def __init__(self, *args, headers=None, **kwargs):
headers = headers or {} self.headers = headers or {}
fields = fields or []
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
# Modify the model form to accommodate any customized to_field_name properties # Modify the model form to accommodate any customized to_field_name properties
for field, to_field in headers.items(): for field, to_field in self.headers.items():
if to_field is not None: if to_field is not None:
self.fields[field].to_field_name = to_field self.fields[field].to_field_name = to_field
# Omit any fields not specified (e.g. because the form is being used to def clean(self):
# updated rather than create objects) # Flag any invalid CSV headers
if fields: for header in self.headers:
for field in list(self.fields.keys()): if header not in self.fields:
if field not in fields: raise forms.ValidationError(
del self.fields[field] _("Unrecognized header: {name}").format(name=header)
)
return super().clean()
class FilterForm(BootstrapMixin, forms.Form): class FilterForm(BootstrapMixin, forms.Form):