Prise en charge des permissions dans l'affichage / masquage de la barre d'outils.

diff --git a/skins/getPhotoInfo.py b/skins/getPhotoInfo.py
index 29477788abd87f3ae099710efc9cdeaed18f728a..bb4391d7d43f783690cc968ba871ede7e647ef06 100755 (executable)
--- a/skins/getPhotoInfo.py
+++ b/skins/getPhotoInfo.py
@@ -1,6 +1,6 @@
 ##parameters=
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.permissions import ReviewPortalContent
+from Products.CMFCore.permissions import ReviewPortalContent, ModifyPortalContent
 mtool = getToolByName(context, 'portal_membership')
 pptool = getToolByName(context, 'portal_photo_print', None)
 uidtool = getToolByName(context, 'portal_uidhandler')
@@ -17,6 +17,9 @@ features['cart'] = lambda o : '%s/get_slide_buyable_items' % o.absolute_url()
 
 if mtool.checkPermission(ReviewPortalContent, context) :
     features['hideAnonymous'] = True
+if mtool.checkPermission(ModifyPortalContent, context) :
+    features['checkbox'] = True
+
 
 sd = context.session_data_manager.getSessionData(create = 1)
 selDict = sd.get('objects_selection_dict', {})

diff --git a/skins/getPhotosInfos.py b/skins/getPhotosInfos.py
index 1679c40aa776345475f8264614799f67f3e91514..2d42635bcf238789c1fa9daacad26afd9524236f 100755 (executable)
--- a/skins/getPhotosInfos.py
+++ b/skins/getPhotosInfos.py
@@ -1,7 +1,7 @@
 ##parameters=portfolio
 from Products.Plinn.PloneMisc import Batch
 from Products.CMFCore.utils import getToolByName
-from Products.CMFCore.permissions import ReviewPortalContent
+from Products.CMFCore.permissions import ReviewPortalContent, ModifyPortalContent
 mtool = getToolByName(context, 'portal_membership')
 pptool = getToolByName(context, 'portal_photo_print', None)
 uidtool = getToolByName(context, 'portal_uidhandler')
@@ -18,6 +18,8 @@ features['cart'] = lambda o : '%s/get_slide_buyable_items' % o.absolute_url()
 
 if mtool.checkPermission(ReviewPortalContent, context) :
     features['hideAnonymous'] = True
+if mtool.checkPermission(ModifyPortalContent, context) :
+    features['checkbox'] = True
 
 req = context.REQUEST
 pho_start = req.get('pho_start', 0)

diff --git a/skins/photo_layout_macros.pt b/skins/photo_layout_macros.pt
index 1ca17fa4a5d05d8bccfb39a6b17f36eb307a255c..f6003ba765fa62a88beb5c6027c96966dbe25655 100644 (file)
--- a/skins/photo_layout_macros.pt
+++ b/skins/photo_layout_macros.pt
@@ -66,7 +66,7 @@
                      i18n:attributes="alt"/>
               </a>
             </span>
-            <span class="button cb">
+            <span class="button cb" tal:condition="features/checkbox|nothing">
               <input type="checkbox" name="uids:list"
                      tal:attributes="value info/cmf_uid"/>
             </span>

diff --git a/skins/portfolio_view.pt b/skins/portfolio_view.pt
index 5535fa8cd999bfd67a3bca4258d7de12e77a644b..96a5882623562ef08b96fdcc42bf76452b4198de 100644 (file)
--- a/skins/portfolio_view.pt
+++ b/skins/portfolio_view.pt
@@ -67,7 +67,9 @@
                      features batchInfos/features"
          tal:omit-tag="">
       <form tal:attributes="action string:${here/absolute_url}/portfolio_edit_form" method="post">
-        <div id="image_toolbar" class="image_toolbar">
+        <div id="image_toolbar" class="image_toolbar"
+             tal:define="ModifyPortalContent modules/Products/CMFCore/permissions/ModifyPortalContent"
+             tal:condition="python:mtool.checkPermission(ModifyPortalContent, here)">
           <input type="image" width="17" height="27" alt="delete" title="delete"
                  name="delete"
                  tal:attributes="src string:$portal_url/trash_btn.gif"