WebDAV dev fixes

tracim/tracim/lib/content.py

@@ -316,7 +316,7 @@ class ContentApi(object):
 
         return result
 
-    def create(self, content_type: str, workspace: Workspace, parent: Content=None, label:str ='', is_temporary:bool =False, do_save=False) -> Content:
+    def create(self, content_type: str, workspace: Workspace, parent: Content=None, label:str ='', do_save=False, is_temporary: bool=False) -> Content:
         assert content_type in ContentType.allowed_types()
         content = Content()
         content.owner = self._user
@@ -457,7 +457,10 @@ class ContentApi(object):
         if content_type!=ContentType.Any:
             resultset = resultset.filter(Content.type==content_type)
 
-        resultset = resultset.filter(Content.parent_id==parent_id)
+        if parent_id:
+            resultset = resultset.filter(Content.parent_id==parent_id)
+        if parent_id is False:
+            resultset = resultset.filter(Content.parent_id == None)
 
         return resultset.all()
 

tracim/tracim/lib/webdav/sql_resources.py

@@ -293,7 +293,7 @@ class Workspace(DAVCollection):
     def getMemberList(self) -> [_DAVResource]:
         members = []
 
-        children = self.content_api.get_all(None, ContentType.Any, self.workspace)
+        children = self.content_api.get_all(False, ContentType.Any, self.workspace)
 
         for content in children:
             content_path = '%s/%s' % (self.path, self.provider.transform_to_display(content.get_label()))
@@ -582,7 +582,7 @@ class HistoryFolder(Folder):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(None, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
         
         for content in children:
             if content.is_archived == self._is_archived and content.is_deleted == self._is_deleted:
@@ -634,7 +634,7 @@ class DeletedFolder(HistoryFolder):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(None, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
 
         for content in children:
             if content.is_deleted:
@@ -651,7 +651,7 @@ class DeletedFolder(HistoryFolder):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(None, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
 
         for content in children:
             if content.is_deleted:
@@ -731,7 +731,7 @@ class ArchivedFolder(HistoryFolder):
         if self.content:
             children = self.content.children
         else:
-            children = self.content_api.get_all(None, ContentType.Any, self.workspace)
+            children = self.content_api.get_all(False, ContentType.Any, self.workspace)
 
         for content in children:
             if content.is_archived:

tracim/tracim/model/data.py

@@ -549,7 +549,7 @@ class ContentRevisionRO(DeclarativeBase):
     _cloned_columns = (
         'content_id', 'created', 'description', 'file_content', 'file_mimetype', 'file_name', 'is_archived',
         'is_deleted', 'label', 'node', 'owner', 'owner_id', 'parent', 'parent_id', 'properties', 'revision_type',
-        'status', 'type', 'updated', 'workspace', 'workspace_id',
+        'status', 'type', 'updated', 'workspace', 'workspace_id', 'is_temporary',
     )
 
     # Read by must be used like this:

tracim/tracim/tests/library/test_content_api.py

@@ -244,9 +244,27 @@ class TestContentApi(BaseTest, TestStandard):
                                                         save_now=True)
 
         api = ContentApi(user)
-        item = api.create(ContentType.Folder, workspace, None, 'parent', True)
-        item2 = api.create(ContentType.File, workspace, item, 'file1', True)
-        item3 = api.create(ContentType.File, workspace, None, 'file2', True)
+        item = api.create(
+            ContentType.Folder,
+            workspace,
+            None,
+            'parent',
+            do_save=True,
+        )
+        item2 = api.create(
+            ContentType.File,
+            workspace,
+            item,
+            'file1',
+            do_save=True,
+        )
+        item3 = api.create(
+            ContentType.File,
+            workspace,
+            None,
+            'file2',
+            do_save=True,
+        )
         parent_id = item.content_id
         child_id = item2.content_id
         uid = user.user_id