darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-09 10:54:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update utils for improved logging

Browse Source
This commit is contained in:
Ryan Ahearn
2023-04-26 11:24:01 -04:00
parent a42617f776
commit 4fc95a4e28
3 changed files with 178 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/main/forms.py
View File

@@ -1103,7 +1103,7 @@ class TwoFactorForm(StripWhitespaceForm):
sms_code = SMSCode('Text message code')
def validate(self):
def validate(self, extra_validators=None):
if not self.sms_code.validate(self):
return False
@@ -1478,8 +1478,8 @@ class AdminProviderRatioForm(Form):
for provider in providers
})
def validate(self):
if not super().validate():
def validate(self, extra_validators=None):
if not super().validate(extra_validators):
return False
total = sum(
@@ -1513,7 +1513,7 @@ class ServiceContactDetailsForm(StripWhitespaceForm):
# This is a text field because the number provided by the user can also be a short code
phone_number = GovukTextInputField("Phone number")
def validate(self):
def validate(self, extra_validators=None):
if self.contact_details_type.data == 'url':
self.url.validators = [DataRequired(), URL(message='Must be a valid URL')]
@@ -1530,7 +1530,7 @@ class ServiceContactDetailsForm(StripWhitespaceForm):
raise ValidationError('Must be a valid phone number')
self.phone_number.validators = [DataRequired(), Length(min=5, max=20), valid_phone_number]
return super().validate()
return super().validate(extra_validators)
class ServiceReplyToEmailForm(StripWhitespaceForm):
@@ -1802,8 +1802,8 @@ class CallbackForm(StripWhitespaceForm):
Length(min=10, message='Must be at least 10 characters')]
)
def validate(self):
return super().validate() or self.url.data == ''
def validate(self, extra_validators=None):
return super().validate(extra_validators) or self.url.data == ''
class SMSPrefixForm(StripWhitespaceForm):
@@ -2027,7 +2027,7 @@ class TemplateAndFoldersSelectionForm(Form):
def is_selected(self, template_folder_id):
return template_folder_id in (self.templates_and_folders.data or [])
def validate(self):
def validate(self, extra_validators=None):
self.op = request.form.get('operation')
self.is_move_op = self.op in {'move-to-existing-folder', 'move-to-new-folder'}
@@ -2037,7 +2037,7 @@ class TemplateAndFoldersSelectionForm(Form):
if not (self.is_add_folder_op or self.is_move_op or self.is_add_template_op):
return False
return super().validate()
return super().validate(extra_validators)
def get_folder_name(self):
if self.op == 'add-new-folder':