rename content_type_slug and sub_content_type_slug

tracim/models/context_models.py

     def __init__(
             self,
             label: str,
-            content_type_slug: str,
+            content_type: str,
     ):
         self.label = label
-        self.content_type_slug = content_type_slug
+        self.content_type = content_type
 
 
 class UserInContext(object):
         return self.content.label
 
     @property
-    def content_type_slug(self) -> str:
+    def content_type(self) -> str:
         return self.content.type
 
     @property
-    def sub_content_type_slug(self) -> typing.List[str]:
+    def sub_content_types(self) -> typing.List[str]:
         return [type.slug for type in self.content.get_allowed_content_types()]
 
     @property

tracim/tests/functional/test_workspaces.py

         assert content['show_in_ui'] is True
         assert content['slug'] == 'tools'
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[1]
         assert content['id'] == 2
         assert content['show_in_ui'] is True
         assert content['slug'] == 'menus'
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
         content = res[2]
         assert content['id'] == 11
         assert content['show_in_ui'] is True
         assert content['slug'] == 'current-menu'
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 1
 
     # Root related
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 4
         content = res[1]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[2]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
         content = res[3]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_active_root_content(self):  # nopep8
         # TODO - G.M - 30-05-2018 - Check this test
         assert len(res) == 2
         content = res[1]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 15
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_archived_root_content(self):  # nopep8
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 16
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_root_content(self):  # nopep8
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 17
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 3
 
     def test_api__get_workspace_content__ok_200__get_nothing_root_content(self):
         ).json_body   # nopep8
         assert len(res) == 3
         content = res[0]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 12
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[1]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
         content = res[2]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_active_folder_content(self):  # nopep8
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug']
+        assert content['content_type']
         assert content['id'] == 12
         assert content['is_archived'] is False
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'] == 'new-fruit-salad'
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_archived_folder_content(self):  # nopep8
         ).json_body   # nopep8
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 13
         assert content['is_archived'] is True
         assert content['is_deleted'] is False
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_only_deleted_folder_content(self):  # nopep8
 
         assert len(res) == 1
         content = res[0]
-        assert content['content_type_slug'] == 'page'
+        assert content['content_type'] == 'page'
         assert content['id'] == 14
         assert content['is_archived'] is False
         assert content['is_deleted'] is True
         assert content['show_in_ui'] is True
         assert content['slug'].startswith('bad-fruit-salad')
         assert content['status_slug'] == 'open'
-        assert set(content['sub_content_type_slug']) == {'thread', 'page', 'folder', 'file'}  # nopep8
+        assert set(content['sub_content_types']) == {'thread', 'page', 'folder', 'file'}  # nopep8
         assert content['workspace_id'] == 2
 
     def test_api__get_workspace_content__ok_200__get_nothing_folder_content(self):  # nopep8
         )
         params = {
             'label': 'GenericCreatedContent',
-            'content_type_slug': 'markdownpage',
+            'content_type': 'markdownpage',
         }
         res = self.testapp.post_json(
             '/api/v2/workspaces/1/contents',
         assert res.json_body
         assert res.json_body['status_slug'] == 'open'
         assert res.json_body['id']
-        assert res.json_body['content_type_slug'] == 'markdownpage'
+        assert res.json_body['content_type'] == 'markdownpage'
         assert res.json_body['is_archived'] is False
         assert res.json_body['is_deleted'] is False
         assert res.json_body['workspace_id'] == 1
         assert res.json_body['slug'] == 'genericcreatedcontent'
         assert res.json_body['parent_id'] is None
         assert res.json_body['show_in_ui'] is True
-        assert res.json_body['sub_content_type_slug']
+        assert res.json_body['sub_content_types']
         params_active = {
             'parent_id': 0,
             'show_archived': 0,

tracim/views/core_api/schemas.py

         example='contract for client XXX',
         description='Title of the content to create'
     )
-    content_type_slug = marshmallow.fields.String(
+    content_type = marshmallow.fields.String(
         example='htmlpage',
         validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
     )
         example=19,
     )
     label = marshmallow.fields.Str(example='Intervention Report 12')
-    content_type_slug = marshmallow.fields.Str(
+    content_type = marshmallow.fields.Str(
         example='htmlpage',
         validate=OneOf([content.slug for content in CONTENT_DEFAULT_TYPE]),
     )
-    sub_content_type_slug = marshmallow.fields.List(
+    sub_content_types = marshmallow.fields.List(
         marshmallow.fields.Str,
         description='list of content types allowed as sub contents. '
                     'This field is required for folder contents, '

tracim/views/core_api/workspace_controller.py

         )
         content = api.create(
             label=creation_data.label,
-            content_type=creation_data.content_type_slug,
+            content_type=creation_data.content_type,
             workspace=request.current_workspace,
         )
         api.save(content, ActionDescription.CREATION)