Browse Source

Edit button hidden if user can't edit doc

sferot 10 years ago
parent
commit
60abe91143
2 changed files with 12 additions and 2 deletions
  1. 10 2
      pboard/pboard/controllers/root.py
  2. 2 0
      pboard/pboard/templates/document-widgets.mak

+ 10 - 2
pboard/pboard/controllers/root.py View File

@@ -143,14 +143,22 @@ class RootController(BaseController):
143 143
         except Exception as e:
144 144
           flash(_('Document not found'), 'error')
145 145
 
146
+        user_specific_group_rights = pld.PODStaticController.getUserDedicatedGroupRightsOnNode(node_id)
147
+
148
+        current_user_rights = None
149
+        for right in user_specific_group_rights:
150
+            if right.group_id == -loCurrentUser.user_id:
151
+                current_user_rights = right
152
+
146 153
         return dict(
147 154
             current_user=loCurrentUser,
148 155
             current_node=loCurrentNode,
149 156
             allowed_nodes=llAccessibleNodes,
150 157
             node_status_list = loNodeStatusList,
151 158
             keywords = highlight,
152
-            user_specific_group_rights = pld.PODStaticController.getUserDedicatedGroupRightsOnNode(node_id),
153
-            real_group_rights = pld.PODStaticController.getRealGroupRightsOnNode(node_id)
159
+            user_specific_group_rights = user_specific_group_rights,
160
+            real_group_rights = pld.PODStaticController.getRealGroupRightsOnNode(node_id),
161
+            current_user_rights = current_user_rights
154 162
         )
155 163
 
156 164
     @expose('pboard.templates.search')

+ 2 - 0
pboard/pboard/templates/document-widgets.mak View File

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