Merge pull request #18 from lebouquetin/master

tracim/tracim/model/data.py

@@ -422,7 +422,7 @@ class Content(DeclarativeBase):
     def get_child_nb(self, content_type: ContentType, content_status = ''):
         child_nb = 0
         for child in self.valid_children:
-            if child.type==content_type:
+            if child.type == content_type or content_type == ContentType.Any:
                 if not content_status:
                     child_nb = child_nb+1
                 elif content_status==child.status:

tracim/tracim/model/serializers.py

@@ -283,11 +283,15 @@ def serialize_content_for_menu_api(content: Content, context: Context):
     content_id = content.content_id
     workspace_id = content.workspace_id
 
+    has_children = False
+    if content.type == ContentType.Folder:
+        has_children = content.get_child_nb(ContentType.Any) > 0
+
     result = DictLikeClass(
         id = CST.TREEVIEW_MENU.ID_TEMPLATE__FULL.format(workspace_id, content_id),
-        children = True, # TODO: make this dynamic
+        children = has_children,
         text = content.get_label(),
-        a_attr = { 'href' : context.url(ContentType.fill_url(content)) },
+        a_attr = { 'href' : context.url(ContentType.fill_url(content))},
         li_attr = { 'title': content.get_label(), 'class': 'tracim-tree-item-is-a-folder' },
         type = content.type,
         state = { 'opened': True if ContentType.Folder!=content.type else False, 'selected': False }

tracim/tracim/tests/library/test_serializers.py

@@ -8,6 +8,8 @@ from sqlalchemy.orm.exc import NoResultFound
 
 import transaction
 
+from tracim.model import DBSession
+
 from tg.util import LazyString
 from tracim.model.data import Content
 from tracim.model.data import ContentType
@@ -206,8 +208,6 @@ class TestSerializers(TestStandard):
 
         s2 = Context(CTX.DEFAULT).toDict(mylist, 'subitems', 'subitems_nb')
 
-        print('----------------->  ---> ', s2)
-        print('----------------->  ', s2.items)
         ok_('subitems' in s2.keys(), s2)
 
         ok_('name' in s2.subitems[0].keys())
@@ -222,6 +222,39 @@ class TestSerializers(TestStandard):
         eq_(3, s2.subitems_nb)
         eq_(3, len(s2.subitems))
 
+        eq_(2, len(s2))
 
 
-        eq_(2, len(s2))
+    def test_serializer_content__menui_api_context__children(self):
+        self.app.get('/_test_vars')  # Allow to create fake context
+
+        folder_without_child = Content()
+        folder_without_child.type = ContentType.Folder
+        res = Context(CTX.MENU_API).toDict(folder_without_child)
+        eq_(False, res['children'])
+
+        folder_with_child = Content()
+        folder_with_child.type = ContentType.Folder
+        folder_without_child.parent = folder_with_child
+        DBSession.add(folder_with_child)
+        DBSession.add(folder_without_child)
+        DBSession.flush()
+
+        res = Context(CTX.MENU_API).toDict(folder_with_child)
+        eq_(True, res['children'])
+
+        for curtype in ContentType.all():
+            if curtype not in (ContentType.Folder, ContentType.Comment):
+                item = Content()
+                item.type = curtype
+
+                fake_child = Content()
+                fake_child.type = curtype
+                fake_child.parent = item
+
+                DBSession.add(item)
+                DBSession.add(fake_child)
+                DBSession.flush()
+
+                res = Context(CTX.MENU_API).toDict(item)
+                eq_(False, res['children'])