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

Merge pull request #2731 from alphagov/fix-empty-message

Browse Source 
Fix empty folder message
This commit is contained in:
Chris Hill-Scott
2019-02-05 14:55:26 +00:00
committed by GitHub
parent ce04c9c45a 34f509af11
commit 27217f1ad1
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/template_list.py
+3 -3
View File
@@ -24,10 +24,10 @@ class TemplateList():
yield TemplateListFolder( yield TemplateListFolder(
item, item,
folders=self.service.get_template_folders( folders=self.service.get_template_folders(
self.template_type, item['id'] template_type, item['id']
), ),
templates=self.service.get_templates( templates=self.service.get_templates(
self.template_type, item['id'] template_type, item['id']
), ),
ancestors=ancestors, ancestors=ancestors,
service_id=self.service.id, service_id=self.service.id,
@@ -38,7 +38,7 @@ class TemplateList():
yield sub_item yield sub_item
for item in self.service.get_templates( for item in self.service.get_templates(
self.template_type, template_folder_id template_type, template_folder_id
): ):
yield TemplateListTemplate( yield TemplateListTemplate(
item, item,
tests/app/main/views/test_template_folders.py
+18
View File
@@ -302,6 +302,24 @@ def test_post_add_template_folder_page(client_request, service_one, mocker, pare
], ],
None, None,
), ),
(
'folder_one_one_one – folder_one_one – folder_one – Templates – service one – GOV.UK Notify',
'Templates / folder_one / folder_one_one / folder_one_one_one',
[
{'template_type': 'email'},
{'template_type': 'email', 'template_folder_id': PARENT_FOLDER_ID},
{'template_type': 'email', 'template_folder_id': CHILD_FOLDER_ID},
],
{
'template_type': 'email',
'template_folder_id': GRANDCHILD_FOLDER_ID,
},
['All', 'Text message', 'Letter'],
[],
[],
[],
'There are no email templates in this folder',
),
( (
'folder_two – Templates – service one – GOV.UK Notify', 'folder_two – Templates – service one – GOV.UK Notify',
'Templates / folder_two', 'Templates / folder_two',