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 #2799 from alphagov/template-nav-order

Browse Source 
Put template type navigation in correct order
This commit is contained in:
Chris Hill-Scott
2019-02-25 15:12:13 +00:00
committed by GitHub
parent 83fe8b8d9a 8aeb203124
commit 96e02d1c18
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/service.py
View File

@@ -39,8 +39,8 @@ class Service():
}
TEMPLATE_TYPES = (
'sms',
'email',
'sms',
'letter',
)

10
tests/app/main/views/test_template_folders.py
View File

@@ -55,7 +55,7 @@ def _template(template_type, name, parent=None, template_id=None):
'Templates',
[],
{},
['Text message', 'Email', 'Letter'],
['Email', 'Text message', 'Letter'],
[
'folder_one 2 folders',
'folder_one / folder_one_one 1 template, 1 folder',
@@ -132,7 +132,7 @@ def _template(template_type, name, parent=None, template_id=None):
'Templates / folder_one',
[{'template_type': 'all'}],
{'template_folder_id': PARENT_FOLDER_ID},
['Text message', 'Email', 'Letter'],
['Email', 'Text message', 'Letter'],
[
'folder_one_one 1 template, 1 folder',
'folder_one_one / folder_one_one_one 1 template',
@@ -193,7 +193,7 @@ def _template(template_type, name, parent=None, template_id=None):
{'template_type': 'all', 'template_folder_id': PARENT_FOLDER_ID},
],
{'template_folder_id': CHILD_FOLDER_ID},
['Text message', 'Email', 'Letter'],
['Email', 'Text message', 'Letter'],
[
'folder_one_one_one 1 template',
'folder_one_one_one / sms_template_nested Text message template',
@@ -219,7 +219,7 @@ def _template(template_type, name, parent=None, template_id=None):
{'template_type': 'all', 'template_folder_id': CHILD_FOLDER_ID},
],
{'template_folder_id': GRANDCHILD_FOLDER_ID},
['Text message', 'Email', 'Letter'],
['Email', 'Text message', 'Letter'],
[
'sms_template_nested Text message template',
],
@@ -254,7 +254,7 @@ def _template(template_type, name, parent=None, template_id=None):
'Templates / folder_two',
[{'template_type': 'all'}],
{'template_folder_id': FOLDER_TWO_ID},
['Text message', 'Email', 'Letter'],
['Email', 'Text message', 'Letter'],
[],
[],
[],

6
tests/app/main/views/test_templates.py
View File

@@ -96,7 +96,7 @@ def test_should_show_add_template_form_if_service_has_folder_permission(
active_user_view_permissions,
'Templates',
{},
['Text message', 'Email', 'Letter'],
['Email', 'Text message', 'Letter'],
[
'sms_template_one',
'sms_template_two',
@@ -124,14 +124,14 @@ def test_should_show_add_template_form_if_service_has_folder_permission(
active_user_view_permissions,
'Templates',
{'template_type': 'letter'},
['All', 'Text message', 'Email'],
['All', 'Email', 'Text message'],
['letter_template_one', 'letter_template_two'],
),
(
active_caseworking_user,
'Templates',
{},
['Text message', 'Email', 'Letter'],
['Email', 'Text message', 'Letter'],
[
'sms_template_one',
'sms_template_two',