improve a bit user/workspace admin screen

tracim/tracim/controllers/admin/user.py

@@ -18,6 +18,8 @@ from formencode import Schema
 from formencode.validators import FieldsMatch
 
 from tracim.controllers import TIMRestController
+from tracim.controllers.user import UserWorkspaceRestController
+
 from tracim.lib import CST
 from tracim.lib import helpers as h
 from tracim.lib.base import logger
@@ -212,6 +214,52 @@ class UserPasswordAdminRestController(TIMRestController):
         tg.redirect(next_url)
 
 
+class UserWorkspaceRestController(TIMRestController):
+
+    def _before(self, *args, **kw):
+        """
+        Instantiate the current workspace in tg.tmpl_context
+        :param args:
+        :param kw:
+        :return:
+        """
+        super(self.__class__, self)._before(args, kw)
+
+        api = UserApi(tg.tmpl_context.current_user)
+        user_id = tg.request.controller_state.routing_args.get('user_id')
+        user = api.get_one(user_id)
+        tg.tmpl_context.user_id = user_id
+        tg.tmpl_context.user = user
+
+    @tg.expose()
+    def enable_notifications(self, workspace_id, next_url=None):
+        workspace_id = int(workspace_id)
+        api = WorkspaceApi(tg.tmpl_context.current_user)
+
+        workspace = api.get_one(workspace_id)
+        api.enable_notifications(tg.tmpl_context.user, workspace)
+        tg.flash(_('User {}: notification enabled for workspace {}').format(
+            tg.tmpl_context.user.get_display_name(), workspace.label))
+
+        if next_url:
+            tg.redirect(tg.url(next_url))
+        tg.redirect(self.parent_controller.url(None, 'me'))
+
+    @tg.expose()
+    def disable_notifications(self, workspace_id, next_url=None):
+        workspace_id = int(workspace_id)
+        api = WorkspaceApi(tg.tmpl_context.current_user)
+
+        workspace = api.get_one(workspace_id)
+        api.disable_notifications(tg.tmpl_context.user, workspace)
+        tg.flash(_('User {}: notification disabled for workspace {}').format(
+            tg.tmpl_context.user.get_display_name(), workspace.label))
+
+        if next_url:
+            tg.redirect(tg.url(next_url))
+        tg.redirect(self.parent_controller.url(None, 'me'))
+
+
 class UserRestController(TIMRestController):
     """
      CRUD Controller allowing to manage Users
@@ -220,6 +268,7 @@ class UserRestController(TIMRestController):
 
     password = UserPasswordAdminRestController()
     profile = UserProfileAdminRestController()
+    workspaces = UserWorkspaceRestController()
 
     @classmethod
     def current_item_id_key_in_context(cls):
@@ -289,10 +338,14 @@ class UserRestController(TIMRestController):
 
         user = api.get_one(user_id) # FIXME
 
-        dictified_user = Context(CTX.USER).toDict(user, 'user')
+        role_api = RoleApi(tg.tmpl_context.current_user)
+        role_list = role_api.get_roles_for_select_field()
+
+        dictified_user = Context(CTX.ADMIN_USER).toDict(user, 'user')
         current_user_content = Context(CTX.CURRENT_USER).toDict(tmpl_context.current_user)
-        fake_api_content = DictLikeClass(current_user=current_user_content)
-        fake_api = Context(CTX.WORKSPACE).toDict(fake_api_content)
+        fake_api_content = DictLikeClass(current_user=current_user_content,
+                                         role_types=role_list)
+        fake_api = Context(CTX.ADMIN_USER).toDict(fake_api_content)
 
         return DictLikeClass(result = dictified_user, fake_api=fake_api)
 

tracim/tracim/controllers/admin/workspace.py

@@ -54,7 +54,6 @@ class RoleInWorkspaceRestController(TIMRestController, BaseController):
     def get_one(self, user_id):
         pass
 
-
     def put(self, *args, **kw):
         pass
 
@@ -90,22 +89,22 @@ class RoleInWorkspaceRestController(TIMRestController, BaseController):
     def undelete(self, user_id, old_role):
         user_id = int(user_id)
         role_id = int(old_role)
-        self._add_user_with_role(user_id, role_id, _('User {} restored in workspace {} as {}'))
+        self._add_user_with_role(user_id, role_id, None, _('User {} restored in workspace {} as {}'))
         tg.redirect(self.parent_controller.url(tg.tmpl_context.workspace_id))
 
     @tg.expose()
-    def post(self, user_id, role_id):
+    def post(self, user_id, role_id, with_notif=False):
         user_id = int(user_id)
         role_id = int(role_id)
-        self._add_user_with_role(user_id, role_id, _('User {} added to workspace {} as {}'))
+        self._add_user_with_role(user_id, role_id, with_notif, _('User {} added to workspace {} as {}'))
         tg.redirect(self.parent_controller.url(tg.tmpl_context.workspace_id))
 
-    def _add_user_with_role(self, user_id: int, role_id: int, flash_msg_template)-> UserRoleInWorkspace:
+    def _add_user_with_role(self, user_id: int, role_id: int, with_notif: bool, flash_msg_template)-> UserRoleInWorkspace:
         user_api = UserApi(tg.tmpl_context.current_user)
         user = user_api.get_one(user_id)
 
         role_api = RoleApi(tg.tmpl_context.current_user)
-        role = role_api.create_one(user, tg.tmpl_context.workspace, role_id)
+        role = role_api.create_one(user, tg.tmpl_context.workspace, role_id, with_notif)
 
         tg.flash(flash_msg_template.format(
             role.user.get_display_name(),

tracim/tracim/lib/userworkspace.py

@@ -50,11 +50,13 @@ class RoleApi(object):
     def get_one(self, user_id, workspace_id):
         return self._get_one_rsc(user_id, workspace_id).one()
 
-    def create_one(self, user: User, workspace: Workspace, role_level: int, flush: bool=True) -> UserRoleInWorkspace:
+    def create_one(self, user: User, workspace: Workspace, role_level: int, with_notif: bool, flush: bool=True) -> UserRoleInWorkspace:
         role = self.create_role()
         role.user_id = user.user_id
         role.workspace = workspace
         role.role = role_level
+        if with_notif is not None:
+            role.do_notify = with_notif
         if flush:
             DBSession.flush()
         return role

tracim/tracim/model/serializers.py

@@ -62,6 +62,7 @@ class ContextConverterNotFoundException(Exception):
 
 class CTX(object):
     """ constants that are used for serialization / dictification of models"""
+    ADMIN_USER = 'ADMIN_USER'
     ADMIN_WORKSPACE = 'ADMIN_WORKSPACE'
     ADMIN_WORKSPACES = 'ADMIN_WORKSPACES'
     CONTENT_LIST = 'CONTENT_LIST'
@@ -785,6 +786,7 @@ def serialize_user_list_default(profile: Profile, context: Context):
 
 
 @pod_serializer(RoleType, CTX.ADMIN_WORKSPACE)
+@pod_serializer(RoleType, CTX.ADMIN_USER)
 def serialize_role_list_for_select_field_in_workspace(role_type: RoleType, context: Context):
     """
     Actually, roles are serialized as users (with minimal information)
@@ -838,6 +840,7 @@ def serialize_user_list_default(user: User, context: Context):
 
 
 @pod_serializer(User, CTX.USER)
+@pod_serializer(User, CTX.ADMIN_USER)
 @pod_serializer(User, CTX.CURRENT_USER)
 def serialize_user_for_user(user: User, context: Context):
     """
@@ -876,13 +879,14 @@ def serialize_role_in_workspace(role: UserRoleInWorkspace, context: Context):
     result['style'] = role.style
     result['role_description'] = role.role_as_label()
     result['email'] = role.user.email
-    result['user'] = role.user
+    result['user'] = context.toDict(role.user)
     result['notifications_subscribed'] = role.do_notify
     return result
 
 
 @pod_serializer(UserRoleInWorkspace, CTX.USER)
 @pod_serializer(UserRoleInWorkspace, CTX.CURRENT_USER)
+@pod_serializer(UserRoleInWorkspace, CTX.ADMIN_USER)
 def serialize_role_in_list_for_user(role: UserRoleInWorkspace, context: Context):
     """
     Actually, roles are serialized as users (with minimal information)
@@ -896,7 +900,7 @@ def serialize_role_in_list_for_user(role: UserRoleInWorkspace, context: Context)
     result['label'] = role.role_as_label()
     result['style'] = RoleType(role.role).css_style
     result['workspace'] =  context.toDict(role.workspace)
-    result['user'] = role.user
+    result['user'] = Context(CTX.DEFAULT).toDict(role.user)
     result['notifications_subscribed'] = role.do_notify
 
     # result['workspace_name'] = role.workspace.label
@@ -910,7 +914,8 @@ def serialize_role_in_list_for_user(role: UserRoleInWorkspace, context: Context)
 def serialize_workspace_default(workspace: Workspace, context: Context):
     result = DictLikeClass(
         id = workspace.workspace_id,
-        label = workspace.label,
+        label = workspace.label,  # FIXME - 2015-08-20 - remove this property
+        name = workspace.label,  # use name instead of label
         url = context.url('/workspaces/{}'.format(workspace.workspace_id))
     )
     return result

tracim/tracim/templates/admin/user_getone.mak

@@ -61,7 +61,7 @@
                             ${ICON.FA('fa-bar-chart t-less-visible')}
                             ${_('Global profile')}
                         </h3>
-                        ${P.USER_PROFILE(result.user)}
+                        ${P.USER_PROFILE(fake_api.current_user, result.user)}
                     </div>
                     <div style="margin-top: 4em;">
                         <h3>
@@ -81,7 +81,11 @@
                                     </tr>
                                 </thead>
                                 % for role in result.user.roles:
-                                    ${TABLE_ROW.USER_ROLE_IN_WORKSPACE(role)}
+<%
+    enable_link = '/admin/users/{user}/workspaces/{workspace}/enable_notifications?next_url=/admin/users/{user}'
+    disable_link = '/admin/users/{user}/workspaces/{workspace}/disable_notifications?next_url=/admin/users/{user}'
+%>
+                                    ${TABLE_ROW.USER_ROLE_IN_WORKSPACE(fake_api.current_user, role, show_id=True, enable_link=enable_link, disable_link=disable_link)}
                                 % endfor
                             </table>
                         % endif

tracim/tracim/templates/admin/workspace_getone.mak

@@ -83,6 +83,12 @@
                                             % endfor
                                         </div>
 
+                                        <div class="checkbox">
+                                            <label>
+                                                <input type="checkbox" id="with_notif" name="with_notif" checked="checked"/> ${_('Subscribe to mail notifications')}
+                                            </label>
+                                        </div>
+
                                         <span class="pull-right" style="margin-top: 0.5em;">
                                             <button id="current-document-add-comment-save-button" type="submit" class="btn btn-small btn-success" title="Add first comment"><i class=" fa fa-check"></i> ${_('Validate')}</button>
                                         </span>

tracim/tracim/templates/home.mak

@@ -157,7 +157,7 @@
                                                 </tr>
                                             </thead>
                                             % for role in fake_api.current_user.roles:
-                                                ${TABLE_ROW.USER_ROLE_IN_WORKSPACE(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')}
+                                                ${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')}
                                             % endfor
                                         </table>
                                     % endif

tracim/tracim/templates/user_get_me.mak

@@ -62,7 +62,7 @@
                             </table>
                         % endif
                     </div>
-                    % if len(result.user.roles)>0:
+                    % if len(result.user.roles) > 0:
                         <p class="alert alert-info">${_('You can configure your email notifications by clicking on the email icons above')}</p>
                     % endif
                 </div>

tracim/tracim/templates/widgets/paragraph.mak

@@ -1,7 +1,7 @@
 <%namespace name="ICON" file="tracim.templates.widgets.icon"/>
 <%namespace name="BUTTON" file="tracim.templates.widgets.button"/>
 
-<%def name="USER_PROFILE(user)">
+<%def name="USER_PROFILE(current_user, user)">
     % if user.profile.id >= 1:
         <p>${ICON.FA('fa-male t-green fa-lg fa-fw')}<span> ${_('This user a standard user.')}</span></p>
     %else:

tracim/tracim/templates/widgets/table_row.mak

@@ -2,14 +2,27 @@
 <%namespace name="ICON" file="tracim.templates.widgets.icon"/>
 <%namespace name="SPAN" file="tracim.templates.widgets.span"/>
 
-<%def name="USER_ROLE_IN_WORKSPACE(role, show_id=True, enable_link=None, disable_link=None)">
+<%def name="USER_ROLE_IN_WORKSPACE(current_user, role, show_id=True, enable_link=None, disable_link=None, role_types=None)">
     <tr>
         % if show_id:
             <td class="text-right">${role.workspace.id}</td>
         % endif
         <td><a href="${tg.url('/admin/workspaces/{}').format(role.workspace.id)}">${role.workspace.name}</a></td>
-        <td><span style="${role.style}"><i class="fa ${role.icon}"></i> ${role.label}</span></td>
-        % if enable_link or disable_link:
+
+        % if role_types:
+            ## <td>${BUTTON.SECURED_ROLE_SELECTOR(fake_api.current_user, result.workspace, member, fake_api.role_types)}</td>
+            <td><span style="${role.style}"><i class="fa ${role.icon}"></i> ${role.label}</span></td>
+        % else:
+            <td><span style="${role.style}"><i class="fa ${role.icon}"></i> ${role.label}</span></td>
+        % endif
+
+        <%
+            user_is_himself = current_user.id == role.user.id
+            user_is_manager = h.user_role(current_user, role.workspace) >= 8
+            ## allow user to change notification status only if current user is manager on the given workspace
+        %>
+
+        % if (enable_link or disable_link) and (user_is_himself or user_is_manager) :
             <td>${SPAN.NOTIFICATION_SUBSCRIBED(role.user, role.workspace, role.notifications_subscribed, enable_link, disable_link)}</td>
         % else:
             <td>${SPAN.NOTIFICATION_SUBSCRIBED(role.user, role.workspace, role.notifications_subscribed)}</td>
@@ -23,7 +36,20 @@
         <td class="text-right">${member.id}</td>
         <td ><a href="${tg.url('/admin/users/{}'.format(member.id))}">${member.name}</a></td>
         <td>${BUTTON.SECURED_ROLE_SELECTOR(fake_api.current_user, result.workspace, member, fake_api.role_types)}</td>
-        <td>${SPAN.NOTIFICATION_SUBSCRIBED(member, workspace, member.notifications_subscribed)}</td>
+        <%
+            user_is_himself = current_user.id == member.id
+            user_is_manager = h.user_role(current_user, workspace) >= 8
+            ## allow user to change notification status only if current user is manager on the given workspace
+
+            enable_link = '/admin/users/{user}/workspaces/{workspace}/enable_notifications?next_url=/admin/workspaces/{workspace}'
+            disable_link = '/admin/users/{user}/workspaces/{workspace}/disable_notifications?next_url=/admin/workspaces/{workspace}'
+        %>
+        % if (enable_link or disable_link) and (user_is_himself or user_is_manager) :
+            <td>${SPAN.NOTIFICATION_SUBSCRIBED(member, workspace, member.notifications_subscribed, enable_link, disable_link)}</td>
+        % else:
+            <td>${SPAN.NOTIFICATION_SUBSCRIBED(member, workspace, member.notifications_subscribed)}</td>
+        % endif
+
         <td><a title="${_('Remove this user from the current workspace')}" class="t-less-visible t-red-on-hover t-red btn btn-default btn-xs" href="${tg.url('/admin/workspaces/{}/roles/{}/delete'.format(result.workspace.id, member.id))}">${ICON.FA('fa-remove fa-fw')}</a></td>
     </tr>
 </%def>