Commit f46977dc authored by Jérome Perrin's avatar Jérome Perrin

Use getSecurityManager().getUser() to get the user name, because...

Use getSecurityManager().getUser() to get the user name, because REQUEST.AUTHENTICATED_USER is not defined in ZopeTestCase requests.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15745 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 671c6bd4
...@@ -75,7 +75,8 @@ In case of duplicate, only the first action will be kept.\n ...@@ -75,7 +75,8 @@ In case of duplicate, only the first action will be kept.\n
`actions` is the mapping returned by ActionsTool.listFilteredActionsFor\n `actions` is the mapping returned by ActionsTool.listFilteredActionsFor\n
The script must be called on the context of the document.\n The script must be called on the context of the document.\n
"""\n """\n
\n from Products.ERP5Type.Cache import CachingMethod\n
from AccessControl import getSecurityManager\n
def filterDuplicateActions(actions):\n def filterDuplicateActions(actions):\n
new_actions = dict()\n new_actions = dict()\n
\n \n
...@@ -102,13 +103,12 @@ def hasDuplicateActions(portal_type, user_name):\n ...@@ -102,13 +103,12 @@ def hasDuplicateActions(portal_type, user_name):\n
return len_actions != len_filtered_actions\n return len_actions != len_filtered_actions\n
\n \n
\n \n
from Products.ERP5Type.Cache import CachingMethod\n
hasDuplicateActions = CachingMethod(\n hasDuplicateActions = CachingMethod(\n
hasDuplicateActions,\n hasDuplicateActions,\n
id=\'Base_filterDuplicateActions.hasDuplicateActions\',\n id=\'Base_filterDuplicateActions.hasDuplicateActions\',\n
cache_factory=\'erp5_ui_long\')\n cache_factory=\'erp5_ui_long\')\n
\n \n
user_name = str(container.REQUEST.AUTHENTICATED_USER)\n user_name = str(getSecurityManager().getUser())\n
if getattr(context, \'getPortalType\', None) is not None:\n if getattr(context, \'getPortalType\', None) is not None:\n
if hasDuplicateActions(context.getPortalType(), user_name):\n if hasDuplicateActions(context.getPortalType(), user_name):\n
return filterDuplicateActions(actions)\n return filterDuplicateActions(actions)\n
...@@ -162,13 +162,14 @@ return actions\n ...@@ -162,13 +162,14 @@ return actions\n
<value> <value>
<tuple> <tuple>
<string>actions</string> <string>actions</string>
<string>filterDuplicateActions</string>
<string>hasDuplicateActions</string>
<string>Products.ERP5Type.Cache</string> <string>Products.ERP5Type.Cache</string>
<string>CachingMethod</string> <string>CachingMethod</string>
<string>AccessControl</string>
<string>getSecurityManager</string>
<string>filterDuplicateActions</string>
<string>hasDuplicateActions</string>
<string>str</string> <string>str</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>container</string>
<string>user_name</string> <string>user_name</string>
<string>getattr</string> <string>getattr</string>
<string>context</string> <string>context</string>
......
414 415
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment