improve way to not show deleted workspaces

tracim/tracim/model/auth.py

@@ -280,6 +280,16 @@ class User(DeclarativeBase):
         from tracim.model.data import UserRoleInWorkspace
         return UserRoleInWorkspace.NOT_APPLICABLE
 
+    def get_active_roles(self) -> ['UserRoleInWorkspace']:
+        """
+        :return: list of roles of the user for all not-deleted workspaces
+        """
+        roles = []
+        for role in self.roles:
+            if not role.workspace.is_deleted:
+                roles.append(role)
+        return roles
+
     def ensure_auth_token(self) -> None:
         """
         Create auth_token if None, regenerate auth_token if too much old.

tracim/tracim/model/serializers.py

@@ -914,7 +914,7 @@ def serialize_user_for_user(user: User, context: Context):
     result['id'] = user.user_id
     result['name'] = user.get_display_name()
     result['email'] = user.email
-    result['roles'] = context.toDict(user.roles)
+    result['roles'] = context.toDict(user.get_active_roles())
     result['enabled'] = user.is_active
     result['profile'] = user.profile
     result['calendar_url'] = user.calendar_url

tracim/tracim/templates/home.mak

@@ -138,7 +138,7 @@
                         </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}')}
+                                ${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>