Closes #189: All workspaces are listed in webdav for super admin

tracim/tracim/fixtures/content.py

@@ -19,14 +19,15 @@ class Content(Fixture):
         bob = self._session.query(model.User) \
             .filter(model.User.email == 'bob@fsf.local') \
             .one()
-        workspace_api = WorkspaceApi(admin)
+        admin_workspace_api = WorkspaceApi(admin)
+        bob_workspace_api = WorkspaceApi(bob)
         content_api = ContentApi(admin)
         role_api = RoleApi(admin)
 
         # Workspaces
-        w1 = workspace_api.create_workspace('w1', save_now=True)
-        w2 = workspace_api.create_workspace('w2', save_now=True)
-        w3 = workspace_api.create_workspace('w3', save_now=True)
+        w1 = admin_workspace_api.create_workspace('w1', save_now=True)
+        w2 = bob_workspace_api.create_workspace('w2', save_now=True)
+        w3 = admin_workspace_api.create_workspace('w3', save_now=True)
 
         # Workspaces roles
         role_api.create_one(
@@ -35,12 +36,6 @@ class Content(Fixture):
             role_level=UserRoleInWorkspace.CONTENT_MANAGER,
             with_notif=False,
         )
-        role_api.create_one(
-            user=bob,
-            workspace=w2,
-            role_level=UserRoleInWorkspace.CONTENT_MANAGER,
-            with_notif=False,
-        )
 
         # Folders
         w1f1 = content_api.create(

tracim/tracim/lib/webdav/sql_resources.py

@@ -109,7 +109,10 @@ class Root(DAVCollection):
         super(Root, self).__init__(path, environ)
 
         self.user = UserApi(None).get_one_by_email(environ['http_authenticator.username'])
-        self.workspace_api = WorkspaceApi(self.user)
+        # TODO BS 20170221: Web interface should list all workspace to. We
+        # disable it here for moment. When web interface will be updated to
+        # list all workspace, change this here to.
+        self.workspace_api = WorkspaceApi(self.user, force_role=True)
 
     def __repr__(self) -> str:
         return '<DAVCollection: Root>'

tracim/tracim/lib/workspace.py

@@ -16,14 +16,19 @@ __author__ = 'damien'
 
 class WorkspaceApi(object):
 
-    def __init__(self, current_user: User):
+    def __init__(self, current_user: User, force_role: bool=False):
+        """
+        :param current_user: Current user of context
+        :param force_role: If True, app role in queries even if admin
+        """
         self._user = current_user
+        self._force_role = force_role
 
     def _base_query_without_roles(self):
         return DBSession.query(Workspace).filter(Workspace.is_deleted==False)
 
     def _base_query(self):
-        if self._user.profile.id>=Group.TIM_ADMIN:
+        if not self._force_role and self._user.profile.id>=Group.TIM_ADMIN:
             return self._base_query_without_roles()
 
         return DBSession.query(Workspace).\

tracim/tracim/tests/library/test_webdav.py

@@ -79,7 +79,7 @@ class TestWebDav(TestStandard):
         ok_(root, msg='Path / should return a Root instance')
         ok_(isinstance(root, Root))
 
-    def test_unit__list_workspaces_with_admin__ok(self):
+    def test_unit__list_workspaces_with_user__ok(self):
         provider = self._get_provider()
         root = provider.getResourceInst(
             '/',
@@ -108,6 +108,35 @@ class TestWebDav(TestStandard):
             workspaces_names,
         ))
 
+    def test_unit__list_workspaces_with_admin__ok(self):
+        provider = self._get_provider()
+        root = provider.getResourceInst(
+            '/',
+            self._get_environ(
+                provider,
+                'admin@admin.admin',
+            )
+        )
+        ok_(root, msg='Path / should return a Root instance')
+        ok_(isinstance(root, Root), msg='Path / should return a Root instance')
+
+        children = root.getMemberList()
+        eq_(
+            2,
+            len(children),
+            msg='Root should return 2 workspaces instead {0}'.format(
+                len(children),
+            )
+        )
+
+        workspaces_names = [w.name for w in children]
+        ok_('w1' in workspaces_names, msg='w1 should be in names ({0})'.format(
+            workspaces_names,
+        ))
+        ok_('w3' in workspaces_names, msg='w3 should be in names ({0})'.format(
+            workspaces_names,
+        ))
+
     def test_unit__list_workspace_folders__ok(self):
         provider = self._get_provider()
         w1 = provider.getResourceInst(