Fix model form issues

members/forms.py

@@ -38,11 +38,18 @@ class MemberForm(forms.ModelForm):
 
         return email
 
+    def _clean_boolean_field(self, key):
+        value = self.data.get(key, None)
+        if value in ['1', '0']:
+            return bool(int(value))
+        else:
+            return value == 'on'
+
     def clean_jas(self):
-        return bool(int(self.data['jas']))
+        return self._clean_boolean_field('jas')
 
     def clean_AYY(self):
-        return bool(int(self.data['AYY']))
+        return self._clean_boolean_field('AYY')
 
     @staticmethod
     def csv_to_models(data, payment_source='AYY'):

members/views.py

@@ -25,7 +25,7 @@ import csv
 import pickle
 from smtplib import SMTPAuthenticationError
 
-from members.models import Member, Request, Payment, MemberConflict
+from members.models import Member, Request, Payment
 from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidationError
 from members.tables import MemberTable, PaymentTable, RequestTable
 

members/views/utils.py

@@ -9,6 +9,7 @@ from django.utils.translation import ugettext as _
 from django.forms.models import model_to_dict
 
 import logging
+import csv
 
 # REST framework
 from members.serializers import MemberSerializer
@@ -17,6 +18,8 @@ from rest_framework import permissions
 from rest_framework.throttling import UserRateThrottle, AnonRateThrottle
 
 from members.models import Member, Request, Payment
+from members.forms import MemberForm, PaymentForm, ApplicationForm, CSVValidationError
+from members.tables import MemberTable, PaymentTable, RequestTable
 
 
 # Can be used to retrieve single member information via REST API