[Erp5-report] r15741 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: yo
Date: Sat Aug 18 15:38:23 2007
New Revision: 15741

URL: http://svn.erp5.org?rev=15741&view=rev
Log:
2007-08-18 yo
* ERP5Site does not have getPortalType, so avoid calling getPortalType if not present.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.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/Base_filterDuplicateActions.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.xml?rev=15741&r1=15740&r2=15741&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.xml Sat Aug 18 15:38:23 2007
@@ -109,8 +109,9 @@
                           cache_factory=\'erp5_ui_long\')\n
 \n
 user_name = str(container.REQUEST.AUTHENTICATED_USER)\n
-if hasDuplicateActions(context.getPortalType(), user_name):\n
-  return filterDuplicateActions(actions)\n
+if getattr(context, \'getPortalType\', None) is not None:\n
+  if hasDuplicateActions(context.getPortalType(), user_name):\n
+    return filterDuplicateActions(actions)\n
 return actions\n
 </string> </value>
         </item>
@@ -169,7 +170,9 @@
                             <string>_getattr_</string>
                             <string>container</string>
                             <string>user_name</string>
+                            <string>getattr</string>
                             <string>context</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>

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=15741&r1=15740&r2=15741&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/change_log Sat Aug 18 15:38:23 2007
@@ -1,3 +1,6 @@
+2007-08-18 yo
+* ERP5Site does not have getPortalType, so avoid calling getPortalType if not present.
+
 2007-07-02 Yusei
 * Fixed a invalid xhtml template.
 

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=15741&r1=15740&r2=15741&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Sat Aug 18 15:38:23 2007
@@ -1,1 +1,1 @@
-413
+414