improve toobar buttons show/hide according to current user rights.

pboard/pboard/controllers/root.py

@@ -141,7 +141,7 @@ class RootController(BaseController):
         except Exception as e:
           flash(_('Document not found'), 'error')
 
-        user_specific_group_rights = pld.PODStaticController.getUserDedicatedGroupRightsOnNode(node_id)
+        user_specific_group_rights = pld.PODStaticController.getUserDedicatedGroupRightsOnNode(loCurrentNode)
 
         current_user_rights = None
         for right in user_specific_group_rights:

pboard/pboard/lib/dbapi.py

@@ -141,15 +141,17 @@ class PODStaticController(object):
     return groupRightsOnNodeCustomSelect
 
   @classmethod
-  def getUserDedicatedGroupRightsOnNode(cls, piNodeId: int) -> pbmd.DIRTY_GroupRightsOnNode:
+  def getUserDedicatedGroupRightsOnNode(cls, node: pbmd.PBNode) -> pbmd.DIRTY_GroupRightsOnNode:
 
-    groupRightsOnNodeCustomSelect = pbm.DBSession\
-        .query(pbmd.DIRTY_GroupRightsOnNode)\
-        .from_statement(pbmd.DIRTY_UserDedicatedGroupRightOnNodeSqlQuery)\
-        .params(node_id=piNodeId)\
-        .all()
+    group_rights_on_node = []
+    if node:
+        group_rights_on_node = pbm.DBSession\
+            .query(pbmd.DIRTY_GroupRightsOnNode)\
+            .from_statement(pbmd.DIRTY_UserDedicatedGroupRightOnNodeSqlQuery)\
+            .params(node_id=node.node_id)\
+            .all()
 
-    return groupRightsOnNodeCustomSelect
+    return group_rights_on_node
 
 
 

pboard/pboard/templates/document-widgets-tabs.mak

@@ -11,7 +11,7 @@
   </ul>
 </%def>
 
-<%def name="AccessManagementTab(poNode)">
+<%def name="AccessManagementTab(poNode, user_rights, user)">
   ######
   ##
   ## THIS WIDGET IS INTENDED TO BE USED ONE TIME ONLY IN A PAGE
@@ -87,11 +87,13 @@
 ##    % endif
 ##  </p>
   <!-- Button to trigger modal -->
+% if user.user_id==poNode.owner_id or (user_rights and user_rights.hasWriteAccess()):
   <a href="#edit-document-share-properties" role="button" class="btn btn-success" data-toggle="modal">
     <i class="fa fa-edit"></i>
     ${_('Edit share options')}
   </a>
-     
+% endif
+
   <!-- Modal -->
   <div
     id="edit-document-share-properties"
@@ -413,7 +415,6 @@
         <p style="list-style-type:none;">
           <i class="fa-fw ${subnode.getIconClass()}"></i>
             <a href="${tg.url('/document/%i'%subnode.node_id)}">
-              ${subnode.data_label}<i class="${subnode.getIconClass()}"></i>
             ${subnode.data_label}
             <span class="label ${subnode.getStatus().css} pull-right" title="${subnode.getStatus().label}">
               <i class="${subnode.getStatus().icon}"></i>

pboard/pboard/templates/document-widgets.mak

@@ -40,12 +40,15 @@
 </%def>
 
         
-<%def name="Toolbar(poNode, plNodeStatusList, plRootNodes, psDivId)">
+<%def name="Toolbar(poNode, plNodeStatusList, plRootNodes, psDivId, user_rights, user)">
   <div id="${psDivId}">
+
+##
+## TOOLBAR ITEMS ARE SHOWN ACCORDING TO THE R/W PERMISSIONS GRANTED TO THE USER
+##
+% if user.user_id==poNode.owner_id or (user_rights and user_rights.hasWriteAccess()):
     <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>
@@ -75,7 +78,8 @@
       % endfor
       </ul>
     </div>
-    
+% endif
+
     <div class="btn-group">
       <button class="btn btn-small btn-success"  data-toggle="dropdown" href="#">
         <i class="fa fa-plus"></i> ${_('Add')}
@@ -106,7 +110,7 @@
         <li><p class="pod-grey"><i class="fa fa-danger"></i> coming soon!</p></li>
       </ul>
     </div>
-
+% if user.user_id==poNode.owner_id or (user_rights and user_rights.hasWriteAccess()):
     <div class="btn-group pull-right">
       <button class="btn btn-small btn-link"  data-toggle="dropdown" href="#">
         ${_('more ...')}
@@ -121,9 +125,9 @@
 ##
         ${ToolbarMenuItemModal(h.ID.MoveDocumentModalForm(current_node), 'fa fa-arrows', _('Move'), 'btn-warning')}
         ${ToolbarMenuItemLink(tg.url('/api/edit_status', dict(node_id=poNode.node_id, node_status='deleted')), 'fa fa-trash-o', _('Delete'), 'btn-danger', _('Delete the current document'), 'return confirm(\'{0}\');'.format('Delete current document?'))}
-
       </ul>
     </div>
+% endif
   </div>
 </%def>
 

pboard/pboard/templates/document.mak

@@ -130,7 +130,10 @@
             nodes = $('#mypodtree .jstree-node');
             console.log("nodes = "+nodes.length);
             if (nodes.length<=0) {
-              $("#mypodtree").append( "<p class='pod-grey'>${_('There is no content yet.')|n}</p>" );
+              $("#mypodtree").append( "<p class='pod-grey'>${_('There is no content yet.')|n}" );
+              $("#mypodtree").append( "<p><a class=\"btn btn-success\" data-toggle=\"modal\" role=\"button\" href=\"#add-document-modal-form\"><i class=\"fa fa-plus\"></i> ${_('Create a topic')}</a></p>" );
+              
+              
             }
           });
         });
@@ -157,7 +160,7 @@
             ##
             ## The Toolbar is a div with a specific id
             ##
-            ${DOC.Toolbar(current_node, node_status_list, root_node_list_for_select_field, 'current-document-toobar')}
+            ${DOC.Toolbar(current_node, node_status_list, root_node_list_for_select_field, 'current-document-toobar', current_user_rights, current_user)}
             ${DOC.ShowTitle(current_node, keywords, 'current-document-title')}
             ${DOC.ShowContent(current_node, keywords)}
           </div>
@@ -196,7 +199,7 @@
               <div class="tab-pane active" id="comments">${DOCTABS.CommentTabContent(current_user, current_node)}</div>
               <div class="tab-pane" id="files">${DOCTABS.FileTabContent(current_node)}</div>
               <div class="tab-pane" id="history">${DOCTABS.HistoryTabContent(current_node)}</div>
-              <div class="tab-pane" id="accessmanagement">${DOCTABS.AccessManagementTab(current_node)}</div>
+              <div class="tab-pane" id="accessmanagement">${DOCTABS.AccessManagementTab(current_node, current_user_rights, current_user)}</div>
             </div>
           </div>
         </div>