From 6ff5a1db42df4c3232c2c7f7bb6475d22747af1a Mon Sep 17 00:00:00 2001 From: Alyssa Bigley Date: Thu, 3 Jun 2021 15:08:47 -0400 Subject: [PATCH] cleaned up csv parsing --- netbox/netbox/views/generic.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netbox/netbox/views/generic.py b/netbox/netbox/views/generic.py index c665c3630..0d1734c08 100644 --- a/netbox/netbox/views/generic.py +++ b/netbox/netbox/views/generic.py @@ -666,7 +666,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): from_form=self.model_form, widget=Textarea(attrs=self.widget_attrs) ) - Upload_CSV = FileField( + upload_csv = FileField( required=False ) return ImportForm(*args, **kwargs) @@ -692,7 +692,7 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): def post(self, request): logger = logging.getLogger('netbox.views.BulkImportView') new_objs = [] - form = self._import_form(request.POST) + form = self._import_form(request.POST, request.FILES) if form.is_valid(): logger.debug("Form validation was successful") @@ -700,8 +700,8 @@ class BulkImportView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View): try: # Iterate through CSV data and bind each row to a new model form instance. with transaction.atomic(): - if len(request.FILES) != 0: - csv_file = request.FILES["Upload_CSV"] + if request.FILES: + csv_file = request.FILES["upload_csv"] csv_file.seek(0) csv_str = csv_file.read().decode('utf-8') reader = csv.reader(csv_str.splitlines())