diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.xml index 7144283adf7824df4bbb4532e60a3bdfaf0f7889..3c8e822f7908047f8e69d75eb894713917be92c0 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_filterDuplicateActions.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> + <tuple/> </tuple> </pickle> <pickle> @@ -76,7 +73,6 @@ In case of duplicate, only the first action will be kept.\n The script must be called on the context of the document.\n """\n from Products.ERP5Type.Cache import CachingMethod\n -from AccessControl import getSecurityManager\n def filterDuplicateActions(actions):\n new_actions = dict()\n \n @@ -108,7 +104,8 @@ hasDuplicateActions = CachingMethod(\n id=\'Base_filterDuplicateActions.hasDuplicateActions\',\n cache_factory=\'erp5_ui_long\')\n \n -user_name = str(getSecurityManager().getUser())\n +user_name = getattr(container.REQUEST, \'AUTHENTICATED_USER\', \'\')\n +\n if getattr(context, \'getPortalType\', None) is not None:\n if hasDuplicateActions(context.getPortalType(), user_name):\n return filterDuplicateActions(actions)\n @@ -164,14 +161,12 @@ return actions\n <string>actions</string> <string>Products.ERP5Type.Cache</string> <string>CachingMethod</string> - <string>AccessControl</string> - <string>getSecurityManager</string> <string>filterDuplicateActions</string> <string>hasDuplicateActions</string> - <string>str</string> + <string>getattr</string> <string>_getattr_</string> + <string>container</string> <string>user_name</string> - <string>getattr</string> <string>context</string> <string>None</string> </tuple> diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index 8b120bce8f826ee72124b968b2dacabf3af889f1..ce163e7b6b4b7eef56c4445149326a929a7a7e3e 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -447 \ No newline at end of file +440 \ No newline at end of file