NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-15 19:52:52 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fixes #11683: Fix CSV header attribute detection when auto-detecting import format

Browse Source
This commit is contained in:
jeremystretch 2023-02-07 17:24:26 -05:00
parent 3f28d6aef3
commit 56c7a238a4
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/version-3.4.md
View File

@ -2,6 +2,10 @@
## v3.4.5 (FUTURE) ## v3.4.5 (FUTURE)
### Bug Fixes
* [#11683](https://github.com/netbox-community/netbox/issues/11683) - Fix CSV header attribute detection when auto-detecting import format
--- ---
## v3.4.4 (2023-02-02) ## v3.4.4 (2023-02-02)

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

@ -384,8 +384,8 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
'data': record, 'data': record,
'instance': instance, 'instance': instance,
} }
if form.cleaned_data['format'] == ImportFormatChoices.CSV: if hasattr(form, '_csv_headers'):
model_form_kwargs['headers'] = form._csv_headers model_form_kwargs['headers'] = form._csv_headers # Add CSV headers
model_form = self.model_form(**model_form_kwargs) model_form = self.model_form(**model_form_kwargs)
# When updating, omit all form fields other than those specified in the record. (No # When updating, omit all form fields other than those specified in the record. (No

2
netbox/utilities/forms/forms.py
View File

@ -197,6 +197,8 @@ class ImportForm(BootstrapMixin, forms.Form):
self.cleaned_data['data'] = self._clean_json(data) self.cleaned_data['data'] = self._clean_json(data)
elif format == ImportFormatChoices.YAML: elif format == ImportFormatChoices.YAML:
self.cleaned_data['data'] = self._clean_yaml(data) self.cleaned_data['data'] = self._clean_yaml(data)
else:
raise forms.ValidationError(f"Unknown data format: {format}")
def _detect_format(self, data): def _detect_format(self, data):
""" """