[Erp5-report] r31618 nicolas.dumazet - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_st...

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Thu Jan  7 07:10:37 2010
New Revision: 31618

URL: http://svn.erp5.org?rev=31618&view=rev
Log:
bug #270: do not show copy/cut/delete buttons if user has no permissions.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml?rev=31618&r1=31617&r2=31618&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml [utf8] Thu Jan  7 07:10:37 2010
@@ -153,20 +153,24 @@
             ui_actions actions/object_ui | nothing;\n
             print_actions actions/object_print | nothing;\n
             list_mode list_mode | nothing;\n
-            can_modify_portal_content python: portal.portal_membership.checkPermission(\'Modify portal content\', here)">\n
+            can_modify_portal_content python: portal.portal_membership.checkPermission(\'Modify portal content\', here);\n
+            can_delete_objects python: portal.portal_membership.checkPermission(\'Delete objects\', here);\n
+            can_copy_or_move python: portal.portal_membership.checkPermission(\'Copy Or Move\', here)">\n
         <span class="separator"><!--separator--></span>\n
         <tal:block tal:condition="list_mode">\n
-          <button class="cut" type="submit" name="Folder_cut:method" title="Cut"\n
-                  i18n:attributes="title" i18n:domain="ui"\n
-                  tal:condition="can_modify_portal_content">\n
-            <span class="image"></span>\n
-            <span class="description" i18n:translate="" i18n:domain="ui">Cut</span>\n
-          </button>\n
-          <button class="copy" type="submit" name="Folder_copy:method" title="Copy"\n
-                  i18n:attributes="title" i18n:domain="ui">\n
-            <span class="image"></span>\n
-            <span class="description" i18n:translate="" i18n:domain="ui">Copy</span>\n
-          </button>\n
+          <tal:block tal:condition="can_copy_or_move">\n
+            <button class="cut" type="submit" name="Folder_cut:method" title="Cut"\n
+                    i18n:attributes="title" i18n:domain="ui"\n
+                    tal:condition="can_modify_portal_content">\n
+              <span class="image"></span>\n
+              <span class="description" i18n:translate="" i18n:domain="ui">Cut</span>\n
+            </button>\n
+            <button class="copy" type="submit" name="Folder_copy:method" title="Copy"\n
+                    i18n:attributes="title" i18n:domain="ui">\n
+              <span class="image"></span>\n
+              <span class="description" i18n:translate="" i18n:domain="ui">Copy</span>\n
+            </button>\n
+          </tal:block>\n
           <button class="paste" type="submit" name="Folder_paste:method" title="Paste"\n
                   i18n:attributes="title" i18n:domain="ui">\n
             <span class="image"></span>\n
@@ -192,7 +196,8 @@
           <span class="image"></span>\n
           <span class="description" i18n:translate="" i18n:domain="ui">Clone</span>\n
         </button>\n
-        <button tal:condition="list_mode" class="delete" type="submit" name="Folder_deleteObjectList:method" title="Delete"\n
+        <button tal:condition="python: list_mode and can_delete_objects" class="delete" type="submit" \n
+                name="Folder_deleteObjectList:method" title="Delete"\n
                 i18n:attributes="title" i18n:domain="ui">\n
           <span class="image"></span>\n
           <span class="description" i18n:translate="" i18n:domain="ui">Delete</span>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log?rev=31618&r1=31617&r2=31618&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log [utf8] Thu Jan  7 07:10:37 2010
@@ -1,5 +1,7 @@
 2010-01-07 Nicolas Dumazet
 * Dont show a New button if there are no Visible Allowed Content Types
+* Do not show Cut/Paste button if no "Copy or Move" permission
+* Do not show Delete button if no "Delete objects" permission
 
 2009-12-11 Kazuhiko
 * update FCKeditor to 2.6.5.
@@ -318,4 +320,4 @@
 
 2006-06-15 Vincent
 * Initial commit.
-* Valid XHTML1.0 Strict + CSS 2.0.
+* Valid XHTML1.0 Strict + CSS 2.0.

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=31618&r1=31617&r2=31618&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Thu Jan  7 07:10:37 2010
@@ -1,1 +1,1 @@
-861
+862