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

Add space around folder name separator when flattening folder path

Browse Source
This commit is contained in:
Alexey Bezhan
2019-03-06 14:56:56 +00:00
committed by Pea Tyczynska
parent 1fb7a2515f
commit 80bfd8e347
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/service.py
View File

@@ -396,7 +396,7 @@ class Service():
"users_with_permission": folder["users_with_permission"] "users_with_permission": folder["users_with_permission"]
} }
while folder_attrs["parent_id"] is not None: while folder_attrs["parent_id"] is not None:
folder_attrs["name"] = parent["name"] + "/" + folder_attrs["name"] folder_attrs["name"] = parent["name"] + " / " + folder_attrs["name"]
if parent["parent_id"] is None: if parent["parent_id"] is None:
folder_attrs["parent_id"] = None folder_attrs["parent_id"] = None
else: else:

10
tests/app/models/test_service.py
View File

@@ -79,13 +79,13 @@ def test_get_user_template_folders_only_returns_folders_visible_to_user(
result = service.get_user_template_folders(active_user_with_permissions.id) result = service.get_user_template_folders(active_user_with_permissions.id)
assert result == [ assert result == [
{ {
'name': "Parent 1 - invisible/1's Visible child", 'name': "Parent 1 - invisible / 1's Visible child",
'id': mocker.ANY, 'id': mocker.ANY,
'parent_id': None, 'parent_id': None,
'users_with_permission': [active_user_with_permissions.id] 'users_with_permission': [active_user_with_permissions.id]
}, },
{ {
'name': "Parent 1 - invisible/1's Invisible child/1's Visible grandchild", 'name': "Parent 1 - invisible / 1's Invisible child / 1's Visible grandchild",
'id': mocker.ANY, 'id': mocker.ANY,
'parent_id': None, 'parent_id': None,
'users_with_permission': [active_user_with_permissions.id] 'users_with_permission': [active_user_with_permissions.id]
@@ -97,7 +97,7 @@ def test_get_user_template_folders_only_returns_folders_visible_to_user(
'users_with_permission': [active_user_with_permissions.id] 'users_with_permission': [active_user_with_permissions.id]
}, },
{ {
'name': "2's Invisible child/2's Visible grandchild", 'name': "2's Invisible child / 2's Visible grandchild",
'id': mocker.ANY, 'id': mocker.ANY,
'parent_id': VIS_PARENT_FOLDER_ID, 'parent_id': VIS_PARENT_FOLDER_ID,
'users_with_permission': [active_user_with_permissions.id] 'users_with_permission': [active_user_with_permissions.id]
@@ -123,13 +123,13 @@ def test_get_template_folders_shows_user_folders_when_user_id_passed_in(
result = service.get_template_folders(user_id=active_user_with_permissions.id) result = service.get_template_folders(user_id=active_user_with_permissions.id)
assert result == [ assert result == [
{ {
'name': "Parent 1 - invisible/1's Visible child", 'name': "Parent 1 - invisible / 1's Visible child",
'id': mocker.ANY, 'id': mocker.ANY,
'parent_id': None, 'parent_id': None,
'users_with_permission': [active_user_with_permissions.id] 'users_with_permission': [active_user_with_permissions.id]
}, },
{ {
'name': "Parent 1 - invisible/1's Invisible child/1's Visible grandchild", 'name': "Parent 1 - invisible / 1's Invisible child / 1's Visible grandchild",
'id': mocker.ANY, 'id': mocker.ANY,
'parent_id': None, 'parent_id': None,
'users_with_permission': [active_user_with_permissions.id] 'users_with_permission': [active_user_with_permissions.id]