From 9980f39a4ebad322c4b237086f6908d46f2e6f5b Mon Sep 17 00:00:00 2001 From: Zack Wong <coffee@ucc.gu.uwa.edu.au> Date: Wed, 6 Feb 2019 20:07:11 +0800 Subject: [PATCH] fixed some account form issues --- src/memberdb/account.py | 4 ++++ src/templates/admin/memberdb/account_create.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/memberdb/account.py b/src/memberdb/account.py index e94039e..a2fa0ee 100644 --- a/src/memberdb/account.py +++ b/src/memberdb/account.py @@ -64,6 +64,8 @@ class EmailForm(MyModelForm): def clean(self): if self['forward'].value() == True: try: + if (len(self['email_address'].value()) == 0): + self.add_error('email_address', 'Email field cannot be left blankL.') if (self['email_address'].value().split('@')[1] in ["ucc.asn.au", "ucc.gu.uwa.edu.au"]): self.add_error('email_address', 'Forwarding address cannot be the same as your account address.') except: @@ -76,12 +78,14 @@ class DispenseForm(MyForm): max_length=4, widget=forms.PasswordInput, strip=False, + required=False, help_text="PIN must be 4 digits long") confirm_pin = forms.CharField( min_length=0, max_length=4, widget=forms.PasswordInput, + required=False, strip=False, ) def clean(self): diff --git a/src/templates/admin/memberdb/account_create.html b/src/templates/admin/memberdb/account_create.html index bd13750..0f76d51 100644 --- a/src/templates/admin/memberdb/account_create.html +++ b/src/templates/admin/memberdb/account_create.html @@ -44,7 +44,7 @@ </fieldset> <div class="submit-row"> {% if wizard.steps.prev %} - <button name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}"> prev </button> + <button name="wizard_goto_step" class="button" type="submit" value="{{ wizard.steps.prev }}"> prev </button> {% endif %} {% if wizard.steps.next %} @@ -60,4 +60,4 @@ </form> </div> -{% endblock %} \ No newline at end of file +{% endblock %} -- GitLab