diff --git a/app/models/service.py b/app/models/service.py index bbcbca3c6..161d77116 100644 --- a/app/models/service.py +++ b/app/models/service.py @@ -396,7 +396,7 @@ class Service(): "users_with_permission": folder["users_with_permission"] } 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: folder_attrs["parent_id"] = None else: diff --git a/tests/app/models/test_service.py b/tests/app/models/test_service.py index 660263013..3ba9063b4 100644 --- a/tests/app/models/test_service.py +++ b/tests/app/models/test_service.py @@ -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) assert result == [ { - 'name': "Parent 1 - invisible/1's Visible child", + 'name': "Parent 1 - invisible / 1's Visible child", 'id': mocker.ANY, 'parent_id': None, '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, 'parent_id': None, '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] }, { - 'name': "2's Invisible child/2's Visible grandchild", + 'name': "2's Invisible child / 2's Visible grandchild", 'id': mocker.ANY, 'parent_id': VIS_PARENT_FOLDER_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) assert result == [ { - 'name': "Parent 1 - invisible/1's Visible child", + 'name': "Parent 1 - invisible / 1's Visible child", 'id': mocker.ANY, 'parent_id': None, '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, 'parent_id': None, 'users_with_permission': [active_user_with_permissions.id]