convert slug page to html-documents

tracim/lib/utils/authorization.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import typing
 from typing import TYPE_CHECKING
-
 import functools
 from pyramid.interfaces import IAuthorizationPolicy
 from zope.interface import implementer
@@ -58,6 +57,7 @@ def require_same_user_or_profile(group: int):
     :return:
     """
     def decorator(func):
+        @functools.wraps(func)
         def wrapper(self, context, request: 'TracimRequest'):
             auth_user = request.current_user
             candidate_user = request.candidate_user
@@ -78,6 +78,7 @@ def require_profile(group: int):
     :return:
     """
     def decorator(func):
+        @functools.wraps(func)
         def wrapper(self, context, request: 'TracimRequest'):
             user = request.current_user
             if user.profile.id >= group:
@@ -96,7 +97,7 @@ def require_workspace_role(minimal_required_role: int):
     :return: decorator
     """
     def decorator(func):
-
+        @functools.wraps(func)
         def wrapper(self, context, request: 'TracimRequest'):
             user = request.current_user
             workspace = request.current_workspace

tracim/models/contents.py

@@ -160,7 +160,7 @@ markdownpluspage_type = NewContentType(
 )
 
 htmlpage_type = NewContentType(
-    slug='page',
+    slug='html-documents',
     fa_icon=htmlpage.fa_icon,
     hexcolor=htmlpage.hexcolor,
     label='Text Document',
@@ -231,6 +231,8 @@ class ContentTypeLegacy(NewContentType):
     MarkdownPage = markdownpluspage_type.slug
 
     def __init__(self, slug: str):
+        if slug == 'page':
+            slug = ContentTypeLegacy.Page
         for content_type in ALL_CONTENTS_DEFAULT_TYPES:
             if slug == content_type.slug:
                 super(ContentTypeLegacy, self).__init__(

tracim/tests/functional/test_contents.py

@@ -44,7 +44,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )   # nopep8
         content = res.json_body
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -90,7 +90,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )
         content = res.json_body
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -117,7 +117,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )   # nopep8
         content = res.json_body
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 6
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -159,7 +159,7 @@ class TestHtmlDocuments(FunctionalTest):
         revisions = res.json_body
         assert len(revisions) == 3
         revision = revisions[0]
-        assert revision['content_type'] == 'page'
+        assert revision['content_type'] == 'html-documents'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -180,7 +180,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
         revision = revisions[1]
-        assert revision['content_type'] == 'page'
+        assert revision['content_type'] == 'html-documents'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -201,7 +201,7 @@ class TestHtmlDocuments(FunctionalTest):
         assert revision['author']['avatar_url'] is None
         assert revision['author']['public_name'] == 'Global manager'
         revision = revisions[2]
-        assert revision['content_type'] == 'page'
+        assert revision['content_type'] == 'html-documents'
         assert revision['content_id'] == 6
         assert revision['is_archived'] is False
         assert revision['is_deleted'] is False
@@ -243,7 +243,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )   # nopep8
         content = res.json_body
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 6
         assert content['status'] == 'open'
 
@@ -260,7 +260,7 @@ class TestHtmlDocuments(FunctionalTest):
             status=200
         )   # nopep8
         content = res.json_body
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 6
         assert content['status'] == 'closed-deprecated'
 

tracim/tests/functional/test_system.py

@@ -124,7 +124,7 @@ class TestContentsTypesEndpoint(FunctionalTest):
         assert len(content_type['available_statuses']) == 4
 
         content_type = res[3]
-        assert content_type['slug'] == 'page'
+        assert content_type['slug'] == 'html-documents'
         assert content_type['fa_icon'] == 'file-text-o'
         assert content_type['hexcolor'] == '#3f52e3'
         assert content_type['label'] == 'Text Document'

tracim/tests/functional/test_workspaces.py

@@ -247,7 +247,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'tools'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[1]
         assert content['content_id'] == 2
@@ -258,7 +258,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'menus'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[2]
         assert content['content_id'] == 11
@@ -269,7 +269,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'current-menu'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     # Root related
@@ -299,7 +299,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 4
         content = res[1]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -308,11 +308,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[2]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -321,11 +321,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[3]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -334,7 +334,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_active_root_content(self):  # nopep8
@@ -362,7 +362,7 @@ class TestWorkspaceContents(FunctionalTest):
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 2
         content = res[1]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -371,7 +371,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_archived_root_content(self):  # nopep8
@@ -398,7 +398,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -407,7 +407,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_root_content(self):  # nopep8
@@ -436,7 +436,7 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -445,7 +445,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_nothing_root_content(self):
@@ -500,7 +500,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 3
         content = res[0]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 12
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
@@ -509,11 +509,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[1]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -522,11 +522,11 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[2]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -535,7 +535,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_active_folder_content(self):  # nopep8
@@ -571,7 +571,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_archived_folder_content(self):  # nopep8
@@ -598,7 +598,7 @@ class TestWorkspaceContents(FunctionalTest):
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
@@ -607,7 +607,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_folder_content(self):  # nopep8
@@ -635,7 +635,7 @@ class TestWorkspaceContents(FunctionalTest):
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type'] == 'page'
+        assert content['content_type'] == 'html-documents'
         assert content['content_id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
@@ -644,7 +644,7 @@ class TestWorkspaceContents(FunctionalTest):
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status'] == 'open'
-        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'html-documents', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_nothing_folder_content(self):  # nopep8

tracim/views/core_api/system_controller.py

@@ -40,7 +40,7 @@ class SystemController(Controller):
     @hapic.output_body(ContentTypeSchema(many=True),)
     def content_types(self, context, request: TracimRequest, hapic_data=None):
         """
-        Get list of alls applications installed in this tracim instance.
+        Get list of alls content types availables in this tracim instance.
         """
 
         return CONTENT_DEFAULT_TYPE

tracim/views/core_api/user_controller.py

@@ -20,12 +20,12 @@ from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import UserIdPathSchema
 from tracim.views.core_api.schemas import WorkspaceDigestSchema
 
-USERS_ENDPOINTS_TAG = 'Users'
+USER_ENDPOINTS_TAG = 'Users'
 
 
 class UserController(Controller):
 
-    @hapic.with_api_doc(tags=[USERS_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[USER_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserProfile, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(UserDoesNotExist, HTTPStatus.NOT_FOUND)

tracim/views/core_api/workspace_controller.py

@@ -34,12 +34,12 @@ from tracim.views.core_api.schemas import WorkspaceMemberSchema
 from tracim.models.contents import ContentTypeLegacy as ContentType
 from tracim.models.revision_protection import new_revision
 
-WORKSPACES_ENDPOINTS_TAG = 'Workspaces'
+WORKSPACE_ENDPOINTS_TAG = 'Workspaces'
 
 
 class WorkspaceController(Controller):
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -59,7 +59,7 @@ class WorkspaceController(Controller):
         )
         return wapi.get_workspace_with_context(request.current_workspace)
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -88,7 +88,7 @@ class WorkspaceController(Controller):
             for user_role in roles
         ]
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -124,7 +124,7 @@ class WorkspaceController(Controller):
         ]
         return contents
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -157,7 +157,7 @@ class WorkspaceController(Controller):
         content = api.get_content_in_context(content)
         return content
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
@@ -166,7 +166,7 @@ class WorkspaceController(Controller):
     @require_candidate_workspace_role(UserRoleInWorkspace.CONTENT_MANAGER)
     @hapic.input_path(WorkspaceAndContentIdPathSchema())
     @hapic.input_body(ContentMoveSchema())
-    @hapic.output_body(ContentDigestSchema())  # nopep8
+    @hapic.output_body(ContentDigestSchema())
     def move_content(
             self,
             context,
@@ -212,7 +212,7 @@ class WorkspaceController(Controller):
         )
         return api.get_content_in_context(updated_content)
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -247,7 +247,7 @@ class WorkspaceController(Controller):
             api.delete(content)
         return
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -283,7 +283,7 @@ class WorkspaceController(Controller):
             api.undelete(content)
         return
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)
@@ -315,7 +315,7 @@ class WorkspaceController(Controller):
             api.archive(content)
         return
 
-    @hapic.with_api_doc(tags=[WORKSPACES_ENDPOINTS_TAG])
+    @hapic.with_api_doc(tags=[WORKSPACE_ENDPOINTS_TAG])
     @hapic.handle_exception(NotAuthenticated, HTTPStatus.UNAUTHORIZED)
     @hapic.handle_exception(InsufficientUserWorkspaceRole, HTTPStatus.FORBIDDEN)
     @hapic.handle_exception(WorkspaceNotFound, HTTPStatus.FORBIDDEN)