From 30712e8e8a1fad52665ed54e383a623b6a71077c Mon Sep 17 00:00:00 2001 From: Nicolas Dumazet <nicolas.dumazet@nexedi.com> Date: Fri, 8 Jan 2010 02:33:52 +0000 Subject: [PATCH] Base_createNewDocument depends on container.getVisibleAllowedContentTypeList Make sure that when not in list mode, New button is displayed correctly (or not) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31656 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_xhtml_style/context_box_render.xml | 7 +++++-- product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 2 files changed, 6 insertions(+), 3 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 b7ee63e023..56fbf08e80 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 @@ -155,7 +155,9 @@ 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_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 <span class="separator"><!--separator--></span>\n <tal:block tal:condition="list_mode">\n <tal:block tal:condition="can_copy_or_move">\n @@ -183,8 +185,9 @@ <span class="image"></span>\n <span class="description" i18n:translate="" i18n:domain="ui">Print</span>\n </button>\n - <button tal:condition="python: len(here.getVisibleAllowedContentTypeList()) > 0" class="new" type="submit" title="New"\n + <button tal:condition="python: list_mode and can_add_object_here or can_add_object_in_container"\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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 8800cb9cad..49681e7139 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -864 \ No newline at end of file +865 \ No newline at end of file -- 2.30.9