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

Sort folders alphabetically

Browse Source 
To match the order in which templates are sorted.
This commit is contained in:
Chris Hill-Scott
2018-11-09 16:04:49 +00:00
parent 07dd59f5b6
commit 4c9f667de3
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/service.py
View File

@@ -289,7 +289,10 @@ class Service():
@cached_property
def all_template_folders(self):
return template_folder_api_client.get_template_folders(self.id)
return sorted(
template_folder_api_client.get_template_folders(self.id),
key=lambda folder: folder['name'].lower(),
)
@cached_property
def all_template_folder_ids(self):

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

@@ -133,10 +133,10 @@ def test_should_show_templates_folder_page(
):
mock_get_template_folders.return_value = [
{'id': PARENT_FOLDER_ID, 'name': 'folder_one', 'parent_id': None},
{'id': str(uuid.uuid4()), 'name': 'folder_two', 'parent_id': None},
{'id': CHILD_FOLDER_ID, 'name': 'folder_one_one', 'parent_id': PARENT_FOLDER_ID},
{'id': PARENT_FOLDER_ID, 'name': 'folder_one', 'parent_id': None},
{'id': str(uuid.uuid4()), 'name': 'folder_one_two', 'parent_id': PARENT_FOLDER_ID},
{'id': CHILD_FOLDER_ID, 'name': 'folder_one_one', 'parent_id': PARENT_FOLDER_ID},
]
service_one['permissions'] += ['letter', 'edit_folders']

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

@@ -252,10 +252,10 @@ def test_should_show_radio_buttons_for_move_destination(
assert radios == page.select('input[name=move_to]')
assert [x['value'] for x in radios] == [
PARENT_FOLDER_ID, FOLDER_TWO_ID, CHILD_FOLDER_ID, FOLDER_ONE_TWO_ID
PARENT_FOLDER_ID, CHILD_FOLDER_ID, FOLDER_ONE_TWO_ID, FOLDER_TWO_ID,
]
assert [x.text.strip() for x in labels] == [
'folder_one', 'folder_two', 'folder_one_one', 'folder_one_two'
'folder_one', 'folder_one_one', 'folder_one_two', 'folder_two',
]
assert page.select_one('button[name=operation]')['value'] == 'move'