diff --git a/app/assets/govuk_elements b/app/assets/govuk_elements index 816c3745b..9e44a8d74 160000 --- a/app/assets/govuk_elements +++ b/app/assets/govuk_elements @@ -1 +1 @@ -Subproject commit 816c3745b0c03fe90e6e6bdef403bb7ea3022a21 +Subproject commit 9e44a8d74cbbab9d32fd006bfba05814c8b0dc83 diff --git a/app/assets/govuk_frontend_toolkit b/app/assets/govuk_frontend_toolkit index 993229873..26b6a60d0 160000 --- a/app/assets/govuk_frontend_toolkit +++ b/app/assets/govuk_frontend_toolkit @@ -1 +1 @@ -Subproject commit 993229873c55747afd5b1cabc74c530589f00e91 +Subproject commit 26b6a60d076c0e717ee4316c21df8938acbf42ff diff --git a/app/main/forms.py b/app/main/forms.py index 0ee3d5827..86d3a6da4 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -62,7 +62,7 @@ class RegisterUserForm(Form): class TwoFactorForm(Form): - sms_code = StringField('sms code', validators=[DataRequired(message='Please enter your code'), + sms_code = StringField('sms code', validators=[DataRequired(message='Enter verification code'), Regexp(regex=verify_code, message='Code must be 5 digits')]) def validate_sms_code(self, a): @@ -114,6 +114,7 @@ class AddServiceForm(Form): def validate_codes(field, code_type): codes = verify_codes_dao.get_codes(user_id=session['user_id'], code_type=code_type) + # TODO need to remove this manual logging. print('validate_codes for user_id: {} are {}'.format(session['user_id'], codes)) if not [code for code in codes if validate_code(field, code)]: raise ValidationError('Code does not match')