Closes #150: Workspace.contents must check if last content revision is still in this workspace

tracim/tracim/controllers/workspace.py

@@ -60,6 +60,7 @@ class UserWorkspaceRestController(TIMRestController):
         )
 
         fake_api.sub_items = Context(CTX.FOLDER_CONTENT_LIST).toDict(
+            # TODO BS 20161209: Is the correct way to grab folders? No use API?
             workspace.get_valid_children(ContentApi.DISPLAYABLE_CONTENTS)
         )
 

tracim/tracim/model/data.py

@@ -64,9 +64,16 @@ class Workspace(DeclarativeBase):
     revisions = relationship("ContentRevisionRO")
 
     @hybrid_property
-    def contents(self):
+    def contents(self) -> ['Content']:
         # Return a list of unique revisions parent content
-        return list(set([revision.node for revision in self.revisions]))
+        contents = []
+        for revision in self.revisions:
+            # TODO BS 20161209: This ``revision.node.workspace`` make a lot
+            # of SQL queries !
+            if revision.node.workspace == self and revision.node not in contents:
+                contents.append(revision.node)
+
+        return contents
 
     @property
     def calendar_url(self) -> str: