Merge pull request #1111 from xzzy/master2

Fix Legacy EmailUser Form

ledger/accounts/forms.py

@@ -122,6 +122,21 @@ def __init__(self, *args, **kwargs):
             self.fields['email'].initial = initial_email
 
 
+class EmailUserLegacyForm(forms.ModelForm):
+    class Meta:
+        model = EmailUser
+        fields = ['email', 'first_name', 'last_name', 'title', 'dob', 'phone_number', 'mobile_number', 'fax_number']
+
+    def __init__(self, *args, **kwargs):
+        email_required = kwargs.pop('email_required', True)
+
+        super(EmailUserForm, self).__init__(*args, **kwargs)
+
+        self.fields['email'].required = email_required
+
+        # some form renderers use widget's is_required field to set required attribute for input element
+        self.fields['email'].widget.is_required = email_required
+
 class EmailUserForm(forms.ModelForm):
 
     identification2 = FileField(label='Upload Identification', required=False, max_length=128, widget=AjaxFileUploader(attrs={'single':'single'})) 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='ledger',
-      version='2.5',
+      version='2.6',
       description='Ledger Payments App',
       url='https://github.com/dbca-wa/ledger',
       author='Department of Parks and Wildlife',