From d1357ed5c05f511f6951ea5a13075d0bd185b9d1 Mon Sep 17 00:00:00 2001 From: Brandon Date: Sat, 17 Dec 2016 02:43:47 -0800 Subject: [PATCH] Fix #359 -- Specific error message for empty bank import. (#363) * added specific error message for no file uploaded for empty bank import added return statements to each if/elif/else for importing bank data file fixed styling according to flake8 * fixed if else ordering --- src/pretix/plugins/banktransfer/views.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pretix/plugins/banktransfer/views.py b/src/pretix/plugins/banktransfer/views.py index 4ac70e5047..dcd59486c3 100644 --- a/src/pretix/plugins/banktransfer/views.py +++ b/src/pretix/plugins/banktransfer/views.py @@ -228,17 +228,22 @@ class ImportView(EventPermissionRequiredMixin, ListView): self.discard_all() return self.redirect_back() - if ('file' in self.request.FILES and 'csv' in self.request.FILES.get('file').name.lower()) \ + elif ('file' in self.request.FILES and 'csv' in self.request.FILES.get('file').name.lower()) \ or 'amount' in self.request.POST: # Process CSV return self.process_csv() - if 'file' in self.request.FILES and 'txt' in self.request.FILES.get('file').name.lower(): + elif 'file' in self.request.FILES and 'txt' in self.request.FILES.get('file').name.lower(): return self.process_mt940() - messages.error(self.request, _('We were unable to detect the file type of this import. Please ' - 'contact support for help.')) - return self.redirect_back() + elif self.request.FILES.get('file') is None: + messages.error(self.request, _('You must choose a file to import.')) + return self.redirect_back() + + else: + messages.error(self.request, _('We were unable to detect the file type of this import. Please ' + 'contact support for help.')) + return self.redirect_back() @cached_property def settings(self):