Pārlūkot izejas kodu

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

Damien Accorsi 11 gadus atpakaļ
vecāks
revīzija
88df015765

+ 10 - 2
pboard/pboard/controllers/root.py Parādīt failu

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

+ 2 - 0
pboard/pboard/templates/document-widgets.mak Parādīt failu

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