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

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Fri Jan  8 03:33:52 2010
New Revision: 31656

URL: http://svn.erp5.org?rev=31656&view=rev
Log:
Base_createNewDocument depends on container.getVisibleAllowedContentTypeList

Make sure that when not in list mode, New button is displayed correctly (or not)

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/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=31656&r1=31655&r2=31656&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] Fri Jan  8 03:33:52 2010
@@ -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

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=31656&r1=31655&r2=31656&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] Fri Jan  8 03:33:52 2010
@@ -1,1 +1,1 @@
-864
+865