Merge branch 'master' of https://bitbucket.org/lebouquetin/protov1

pboard/pboard/controllers/root.py

@@ -146,14 +146,22 @@ class RootController(BaseController):
         except Exception as e:
           flash(_('Document not found'), 'error')
 
+        user_specific_group_rights = pld.PODStaticController.getUserDedicatedGroupRightsOnNode(node_id)
+
+        current_user_rights = None
+        for right in user_specific_group_rights:
+            if right.group_id == -loCurrentUser.user_id:
+                current_user_rights = right
+
         return dict(
             current_user=loCurrentUser,
             current_node=loCurrentNode,
             allowed_nodes=llAccessibleNodes,
             node_status_list = loNodeStatusList,
             keywords = highlight,
-            user_specific_group_rights = pld.PODStaticController.getUserDedicatedGroupRightsOnNode(node_id),
-            real_group_rights = pld.PODStaticController.getRealGroupRightsOnNode(node_id)
+            user_specific_group_rights = user_specific_group_rights,
+            real_group_rights = pld.PODStaticController.getRealGroupRightsOnNode(node_id),
+            current_user_rights = current_user_rights
         )
 
     @expose('pboard.templates.search')

pboard/pboard/templates/document-widgets.mak

@@ -43,7 +43,9 @@
 <%def name="Toolbar(poNode, plNodeStatusList, plRootNodes, psDivId)">
   <div id="${psDivId}">
     <div class="btn-group">
+	% if current_user_rights and current_user_rights.hasWriteAccess():
       ${POD.EditButton('current-document-content-edit-button', True)}
+	% endif
 
       <button class="btn btn-small"  data-toggle="dropdown" href="#"> 
         <i class="fa  fa-signal"></i>