Drops deleted workspaces from home page dashboard tabs (#420)

tracim/tracim/lib/content.py

@@ -735,7 +735,10 @@ class ContentApi(object):
         assert content_type is not None# DYN_REMOVE
         assert isinstance(content_type, str) # DYN_REMOVE
 
-        resultset = self._base_query(workspace).order_by(desc(Content.updated))
+        resultset = self._base_query(workspace) \
+            .filter(Content.workspace_id == Workspace.workspace_id) \
+            .filter(Workspace.is_deleted.is_(False)) \
+            .order_by(desc(Content.updated))
 
         if content_type!=ContentType.Any:
             resultset = resultset.filter(Content.type==content_type)
@@ -773,6 +776,8 @@ class ContentApi(object):
 
         not_read_revisions = self._revisions_base_query(workspace) \
             .filter(~ContentRevisionRO.revision_id.in_(read_revision_ids)) \
+            .filter(ContentRevisionRO.workspace_id == Workspace.workspace_id) \
+            .filter(Workspace.is_deleted.is_(False)) \
             .subquery()
 
         not_read_content_ids_query = DBSession.query(

tracim/tracim/model/serializers.py

@@ -996,6 +996,7 @@ def serialize_workspace_in_list_for_one_user(workspace: Workspace, context: Cont
     result = DictLikeClass()
     result['id'] = workspace.workspace_id
     result['name'] = workspace.label
+    result['is_deleted'] = workspace.is_deleted
 
     return result
 

tracim/tracim/templates/home.mak

@@ -137,7 +137,9 @@
                             </tr>
                         </thead>
                         % for role in fake_api.current_user.roles:
+                            % if not role.workspace.is_deleted:
                             ${TABLE_ROW.USER_ROLE_IN_WORKSPACE(fake_api.current_user, role, show_id=False, enable_link='/user/me/workspaces/{workspace}/enable_notifications?next_url=/home', disable_link='/user/me/workspaces/{workspace}/disable_notifications?next_url=/home', base_link='/workspaces/{workspace}')}
+                            % endif
                         % endfor
                     </table>
                 % endif