mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-23 17:08:41 -06:00
changed name of csv_file variable and started work on ValidationError
This commit is contained in:
parent
3549fc07f6
commit
55b7cf21cc
@ -665,10 +665,16 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
|
|||||||
from_form=self.model_form,
|
from_form=self.model_form,
|
||||||
widget=Textarea(attrs=self.widget_attrs)
|
widget=Textarea(attrs=self.widget_attrs)
|
||||||
)
|
)
|
||||||
upload_csv = CSVFileField(
|
csv_file = CSVFileField(
|
||||||
|
label="CSV file",
|
||||||
from_form=self.model_form,
|
from_form=self.model_form,
|
||||||
required=False
|
required=False
|
||||||
)
|
)
|
||||||
|
def used_both_methods(self):
|
||||||
|
if self.cleaned_data['csv_file'][1] and self.cleaned_data['csv'][1]:
|
||||||
|
raise ValidationError('')
|
||||||
|
return False
|
||||||
|
|
||||||
return ImportForm(*args, **kwargs)
|
return ImportForm(*args, **kwargs)
|
||||||
|
|
||||||
def _save_obj(self, obj_form, request):
|
def _save_obj(self, obj_form, request):
|
||||||
@ -694,14 +700,14 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
|
|||||||
new_objs = []
|
new_objs = []
|
||||||
form = self._import_form(request.POST, request.FILES)
|
form = self._import_form(request.POST, request.FILES)
|
||||||
|
|
||||||
if form.is_valid():
|
if form.is_valid() and not form.used_both_methods():
|
||||||
logger.debug("Form validation was successful")
|
logger.debug("Form validation was successful")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Iterate through CSV data and bind each row to a new model form instance.
|
# Iterate through CSV data and bind each row to a new model form instance.
|
||||||
with transaction.atomic():
|
with transaction.atomic():
|
||||||
if request.FILES:
|
if request.FILES:
|
||||||
headers, records = form.cleaned_data['upload_csv']
|
headers, records = form.cleaned_data['csv_file']
|
||||||
else:
|
else:
|
||||||
headers, records = form.cleaned_data['csv']
|
headers, records = form.cleaned_data['csv']
|
||||||
for row, data in enumerate(records, start=1):
|
for row, data in enumerate(records, start=1):
|
||||||
|
@ -246,6 +246,7 @@ class CSVFileField(forms.FileField):
|
|||||||
def to_python(self, file):
|
def to_python(self, file):
|
||||||
|
|
||||||
records = []
|
records = []
|
||||||
|
if file:
|
||||||
csv_str = file.read().decode('utf-8')
|
csv_str = file.read().decode('utf-8')
|
||||||
reader = csv.reader(csv_str.splitlines())
|
reader = csv.reader(csv_str.splitlines())
|
||||||
|
|
||||||
@ -254,6 +255,7 @@ class CSVFileField(forms.FileField):
|
|||||||
# `site.slug` header, to indicate the related site is being referenced by its slug.
|
# `site.slug` header, to indicate the related site is being referenced by its slug.
|
||||||
|
|
||||||
headers = {}
|
headers = {}
|
||||||
|
if file:
|
||||||
for header in next(reader):
|
for header in next(reader):
|
||||||
if '.' in header:
|
if '.' in header:
|
||||||
field, to_field = header.split('.', 1)
|
field, to_field = header.split('.', 1)
|
||||||
@ -275,6 +277,8 @@ class CSVFileField(forms.FileField):
|
|||||||
|
|
||||||
def validate(self, value):
|
def validate(self, value):
|
||||||
headers, records = value
|
headers, records = value
|
||||||
|
if not headers and not records:
|
||||||
|
return value
|
||||||
|
|
||||||
# Validate provided column headers
|
# Validate provided column headers
|
||||||
for field, to_field in headers.items():
|
for field, to_field in headers.items():
|
||||||
|
Loading…
Reference in New Issue
Block a user