From 168a8c17bc3601e5d5bfa6a9f36bfe03175d5a34 Mon Sep 17 00:00:00 2001 From: Yingtong Li Date: Tue, 29 Jan 2019 15:35:15 +1100 Subject: [PATCH] Fix bug in import save when non-existent member --- ssmembership/views.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ssmembership/views.py b/ssmembership/views.py index 5fd0d10..49cdc7e 100644 --- a/ssmembership/views.py +++ b/ssmembership/views.py @@ -121,17 +121,22 @@ def import_save(request): member = mimport.by_email(request.POST['email_orig']) - if member: - member.student_id = request.POST['student_id'] - member.email = request.POST['email'] - member.first_name = request.POST['first_name'] - member.last_name = request.POST['last_name'] - member.phone = request.POST['phone'] - member.year = int(request.POST['year']) - member.is_msa = True if request.POST['is_msa'] == '1' else '0' - - errors = member.validation_problems() - if not member or len(errors) > 0: + if not member: + return render(request, 'ssmembership/import/review.html', { + 'member': member + }) + + member.student_id = request.POST['student_id'] + member.email = request.POST['email'] + member.first_name = request.POST['first_name'] + member.last_name = request.POST['last_name'] + member.phone = request.POST['phone'] + member.year = int(request.POST['year']) + member.is_msa = True if request.POST['is_msa'] == '1' else '0' + + errors = member.validation_problems() + + if len(errors) > 0: return render(request, 'ssmembership/import/review.html', { 'member': member, 'years': models.Member.YEARS,