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

fix being able to add template without selecting a radio button

Browse Source
This commit is contained in:
Leo Hemsted
2018-12-07 16:38:48 +00:00
parent 180654046a
commit 6f8dc7e6d3
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/main/forms.py
View File

@@ -1151,17 +1151,17 @@ def required_for_ops(*operations):
operations = set(operations)
def validate(form, field):
if form.op not in operations and field.data:
if form.op not in operations and any(field.raw_data):
# super weird
raise ValidationError('Must be empty')
if form.op in operations and not field.data:
raise ValidationError('Can’t be empty')
raise validators.StopValidation('Must be empty')
if form.op in operations and not any(field.raw_data):
raise validators.StopValidation('Can’t be empty')
return validate
class TemplateAndFoldersSelectionForm(Form):
"""
This form also expects the form data to include an operation, based on which submit button is clicked.
This form expects the form data to include an operation, based on which submit button is clicked.
If enter is pressed, unknown will be sent by a hidden submit button at the top of the form.
The value of this operation affects which fields are required, expected to be empty, or optional.
@@ -1248,6 +1248,6 @@ class TemplateAndFoldersSelectionForm(Form):
move_to_new_folder_name = StringField('Folder name', validators=[required_for_ops('move-to-new-folder')])
add_template_by_template_type = RadioField('Add new', validators=[
required_for_ops('add-new-template'),
Optional(),
required_for_ops('add-new-template')
])