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

Merge pull request #4180 from alphagov/dedup-something-else-181415991

Browse Source 
Link directly to email branding "something else"
This commit is contained in:
Ben Thorner
2022-03-07 11:33:11 +00:00
committed by GitHub
parent a7e6d5b442 c22d3412fa
commit f827a825a1
6 changed files with 116 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/forms.py
View File

@@ -2255,10 +2255,7 @@ class BrandingOptions(StripWhitespaceForm):
return self.options.choices == (self.FALLBACK_OPTION,)
def validate_something_else(self, field):
if self.branding_type == 'email':
if self.something_else_is_only_option and not field.data:
raise ValidationError('Cannot be empty')
elif self.branding_type == 'letter':
if self.branding_type == 'letter':
if (
self.something_else_is_only_option
or self.options.data == self.FALLBACK_OPTION_VALUE