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

Let users add new template from the choose page

Browse Source 
Since we’re letting users add new folders directly from the choose page
it makes sense that they should also be able to add templates from
there.

This resolves the problem we saw in user research where people found it
hard to know where to go to add a new folder when they were all behind
one green button.
This commit is contained in:
Chris Hill-Scott
2018-11-28 13:48:13 +00:00
parent 8aeea9929f
commit 10100e51b6
6 changed files with 234 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/main/forms.py
View File

@@ -717,7 +717,14 @@ class FieldWithNoneOption():
class RadioFieldWithNoneOption(FieldWithNoneOption, RadioField):
pass
def validate(self, *args, **kwargs):
if self.data == self.NONE_OPTION_VALUE:
self.data = None
return True
return super().validate(*args, **kwargs)
class HiddenFieldWithNoneOption(FieldWithNoneOption, HiddenField):
@@ -1174,6 +1181,8 @@ class TemplateAndFoldersSelectionForm(Form):
all_template_folders,
template_list,
current_folder_id,
allow_adding_letter_template,
allow_adding_copy_of_template,
*args,
**kwargs
):
@@ -1183,7 +1192,7 @@ class TemplateAndFoldersSelectionForm(Form):
self.templates_and_folders.choices = template_list.as_id_and_name
self.op = None
self.is_move_op = self.is_add_op = False
self.is_move_op = self.is_add_folder_op = self.is_add_template_op = False
self.move_to.choices = [
(item['id'], item['name'])
@@ -1191,13 +1200,21 @@ class TemplateAndFoldersSelectionForm(Form):
if item['id'] != str(current_folder_id)
]
self.add_template_by_template_type.choices = filter(None, [
('email', 'Email template'),
('sms', 'Text message template'),
('letter', 'Letter template') if allow_adding_letter_template else None,
('copy-existing', 'Copy of an existing template') if allow_adding_copy_of_template else None,
])
def validate(self):
self.op = request.form.get('operation')
self.is_move_op = self.op in {'move_to_existing_folder', 'move_to_new_folder'}
self.is_add_op = self.op in {'add_new_folder', 'move_to_new_folder'}
self.is_add_folder_op = self.op in {'add_new_folder', 'move_to_new_folder'}
self.is_add_template_op = self.op in {'add_template'}
if not (self.is_add_op or self.is_move_op):
if not (self.is_add_folder_op or self.is_move_op or self.is_add_template_op):
return False
return super().validate()
@@ -1218,3 +1235,7 @@ class TemplateAndFoldersSelectionForm(Form):
])
add_new_folder_name = StringField('Folder name', validators=[required_for_ops('add_new_folder')])
move_to_new_folder_name = StringField('Folder name', validators=[required_for_ops('move_to_new_folder')])
add_template_by_template_type = RadioFieldWithNoneOption('Add new', validators=[
required_for_ops('add_template')
])