From 6250f795d44ec47389fe206a109af757a997fdb9 Mon Sep 17 00:00:00 2001 From: Ivan Tyagov <ivan@nexedi.com> Date: Fri, 8 Jan 2010 11:55:13 +0000 Subject: [PATCH] Partially revert r31656. In list_mode when doing side wide full text search using top, right input container is equal to Zope application object where getVisibleAllowedContentTypeList is not available. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31664 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_xhtml_style/context_box_render.xml | 5 ++--- product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 2 files changed, 3 insertions(+), 4 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 56fbf08e80..96425d154d 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 @@ -156,8 +156,7 @@ 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_add_object_in_container python: len(container.getVisibleAllowedContentTypeList()) > 0">\n + can_add_object_here python: len(here.getVisibleAllowedContentTypeList()) > 0;">\n <span class="separator"><!--separator--></span>\n <tal:block tal:condition="list_mode">\n <tal:block tal:condition="can_copy_or_move">\n @@ -185,7 +184,7 @@ <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 or can_add_object_in_container"\n + <button tal:condition="python: list_mode and can_add_object_here"\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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 49681e7139..bbff031a29 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -865 \ No newline at end of file +867 \ No newline at end of file -- 2.30.9