Merge branch 'develop' of github.com:tracim/tracim_v2 into develop

backend/tracim_backend/models/context_models.py

@@ -291,7 +291,7 @@ class ContentCreation(object):
     ) -> None:
         self.label = label
         self.content_type = content_type
-        self.parent_id = parent_id
+        self.parent_id = parent_id or None
 
 
 class CommentCreation(object):

backend/tracim_backend/tests/functional/test_workspaces.py

@@ -1436,6 +1436,7 @@ class TestWorkspaceContents(FunctionalTest):
             )
         )
         params = {
+            'parent_id': None,
             'label': 'GenericCreatedContent',
             'content_type': 'markdownpage',
         }
@@ -1466,6 +1467,70 @@ class TestWorkspaceContents(FunctionalTest):
         active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
         assert res.json_body in active_contents
 
+    def test_api__post_content_create_generic_content__ok_200__no_parent_id_param(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'label': 'GenericCreatedContent',
+            'content_type': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=200
+        )
+        assert res
+        assert res.json_body
+        assert res.json_body['status'] == 'open'
+        assert res.json_body['content_id']
+        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_types']
+        params_active = {
+            'parent_id': 0,
+            'show_archived': 0,
+            'show_deleted': 0,
+            'show_active': 1,
+        }
+        # INFO - G.M - 2018-06-165 - Verify if new content is correctly created
+        active_contents = self.testapp.get('/api/v2/workspaces/1/contents', params=params_active, status=200).json_body  # nopep8
+        assert res.json_body in active_contents
+
+    def test_api__post_content_create_generic_content__err_400__parent_id_0(self) -> None:  # nopep8
+        """
+        Create generic content
+        """
+        self.testapp.authorization = (
+            'Basic',
+            (
+                'admin@admin.admin',
+                'admin@admin.admin'
+            )
+        )
+        params = {
+            'parent_id': 0,
+            'label': 'GenericCreatedContent',
+            'content_type': 'markdownpage',
+        }
+        res = self.testapp.post_json(
+            '/api/v2/workspaces/1/contents',
+            params=params,
+            status=400
+        )
+
     def test_api__post_content_create_generic_content__ok_200__in_folder(self) -> None:  # nopep8
         """
         Create generic content in folder

backend/tracim_backend/views/core_api/schemas.py

@@ -650,12 +650,15 @@ class ContentCreationSchema(marshmallow.Schema):
     )
     parent_id = marshmallow.fields.Integer(
         example=35,
-        description='content_id of parent content, if content should be placed in a folder, this should be folder content_id.'
+        description='content_id of parent content, if content should be placed in a folder, this should be folder content_id.', # nopep8
+        allow_none=True,
+        default=None,
+        validate=Range(min=1, error="Value must be positive"),
     )
 
 
     @post_load
-    def make_content_filter(self, data):
+    def make_content_creation(self, data):
         return ContentCreation(**data)