From 8d4c5605c403822cfb35b4bc34745971aa011f16 Mon Sep 17 00:00:00 2001
From: Nicolas Dumazet <nicolas.dumazet@nexedi.com>
Date: Tue, 12 Jan 2010 02:07:32 +0000
Subject: [PATCH] Revert my changes on context box buttons.

They were untested, and inducing performance loss.
31664 was also removing the possibility to add same-type object in the container
when in non-list mode.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31697 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../erp5_xhtml_style/context_box_render.xml   | 35 ++++++++-----------
 .../bootstrap/erp5_xhtml_style/bt/change_log  |  5 ---
 .../bootstrap/erp5_xhtml_style/bt/revision    |  2 +-
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
index 96425d154d..e19421f8e9 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.xml
@@ -153,25 +153,20 @@
             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_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
-            can_add_object_here python: len(here.getVisibleAllowedContentTypeList()) > 0;">\n
+            can_modify_portal_content python: portal.portal_membership.checkPermission(\'Modify portal content\', here)">\n
         <span class="separator"><!--separator--></span>\n
         <tal:block tal:condition="list_mode">\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="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
           <button class="paste" type="submit" name="Folder_paste:method" title="Paste"\n
                   i18n:attributes="title" i18n:domain="ui">\n
             <span class="image"></span>\n
@@ -184,9 +179,8 @@
           <span class="image"></span>\n
           <span class="description" i18n:translate="" i18n:domain="ui">Print</span>\n
         </button>\n
-        <button tal:condition="python: list_mode and can_add_object_here"\n
+        <button class="new" type="submit" title="New"\n
                 tal:attributes="name python: list_mode and \'Folder_create:method\' or \'Base_createNewDocument:method\'"\n
-                class="new" type="submit" title="New"\n
                 i18n:attributes="title" i18n:domain="ui">\n
           <span class="image"></span>\n
           <span class="description" i18n:translate="" i18n:domain="ui">New</span>\n
@@ -198,8 +192,7 @@
           <span class="image"></span>\n
           <span class="description" i18n:translate="" i18n:domain="ui">Clone</span>\n
         </button>\n
-        <button tal:condition="python: list_mode and can_delete_objects" class="delete" type="submit" \n
-                name="Folder_deleteObjectList:method" title="Delete"\n
+        <button tal:condition="list_mode" class="delete" type="submit" 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
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
index e09ddea50f..c0ba0c7ff0 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/change_log
@@ -1,8 +1,3 @@
-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.
 
diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
index bbff031a29..e39afc8dd2 100644
--- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
+++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision
@@ -1 +1 @@
-867
\ No newline at end of file
+868
\ No newline at end of file
-- 
2.30.9