Merge branch 'beta_1.0' of https://github.com/tracim/tracim into beta_1.0

tracim/development.ini.base

@@ -202,6 +202,9 @@ email.notification.smtp.password = your_smtp_password
 ## in this case, you have to create your own proxy behind this url.
 # radicale.client.base_url = http://127.0.0.1:5232
 
+## WSGIDAV
+wsgidav.config_path = wsgidav.conf
+
 #####
 #
 # All configuration below is about logging.

tracim/tracim/config/app_cfg.py

@@ -296,6 +296,8 @@ class CFG(object):
             '604800',
         ))
 
+        self.WSGIDAV_CONFIG_PATH = tg.config.get('wsgidav.config_path')
+
     def get_tracker_js_content(self, js_tracker_file_path = None):
         js_tracker_file_path = tg.config.get('js_tracker_path', None)
         if js_tracker_file_path:

tracim/tracim/controllers/content.py

@@ -712,11 +712,17 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
 
         fake_api = Context(CTX.FOLDER).toDict(fake_api_content)
 
-        fake_api.sub_items = Context(CTX.FOLDER_CONTENT_LIST).toDict(
-            folder.get_valid_children([ContentType.Folder,
-                                       ContentType.File,
-                                       ContentType.Page,
-                                       ContentType.Thread]))
+        sub_items = content_api.get_children(
+            parent_id=folder.content_id,
+            content_types=[
+                ContentType.Folder,
+                ContentType.File,
+                ContentType.Page,
+                ContentType.Thread,
+            ],
+
+        )
+        fake_api.sub_items = Context(CTX.FOLDER_CONTENT_LIST).toDict(sub_items)
 
         fake_api.content_types = Context(CTX.DEFAULT).toDict(
             content_api.get_all_types())

tracim/tracim/lib/content.py

@@ -467,6 +467,24 @@ class ContentApi(object):
 
         return resultset.all()
 
+    def get_children(self, parent_id: int, content_types: list, workspace: Workspace=None) -> [Content]:
+        """
+        Return parent_id childs of given content_types
+        :param parent_id: parent id
+        :param content_types: list of types
+        :param workspace: workspace filter
+        :return: list of content
+        """
+        resultset = self._base_query(workspace)
+        resultset = resultset.filter(Content.type.in_(content_types))
+
+        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()
+
     # TODO find an other name to filter on is_deleted / is_archived
     def get_all_with_filter(self, parent_id: int=None, content_type: str=ContentType.Any, workspace: Workspace=None) -> [Content]:
         assert parent_id is None or isinstance(parent_id, int) # DYN_REMOVE

tracim/tracim/lib/daemons.py

@@ -268,13 +268,15 @@ class WsgiDavDaemon(Daemon):
 
     def _initConfig(self):
         """Setup configuration dictionary from default, command line and configuration file."""
+        from tg import config as tg_config
 
         # Set config defaults
         config = DEFAULT_CONFIG.copy()
         temp_verbose = config["verbose"]
 
         # Configuration file overrides defaults
-        config_file = os.path.abspath(DEFAULT_CONFIG_FILE)
+        default_config_file = os.path.abspath(DEFAULT_CONFIG_FILE)
+        config_file = tg_config.get('wsgidav.config_path', default_config_file)
         fileConf = self._readConfigFile(config_file, temp_verbose)
         config.update(fileConf)