diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml index e855792b60db8c92cfc9f099d8fd32ae252e231c..9b3570cc6cce1c6017efb510e3ffb06ac1f0f7db 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/ERP5Site_getModuleItemList.xml @@ -70,11 +70,12 @@ <key> <string>_body</string> </key> <value> <string>from Products.ERP5Type.Cache import CachingMethod\n \n -user = context.portal_membership.getAuthenticatedMember().getUserName()\n portal = context.getPortalObject()\n +user = portal.portal_membership.getAuthenticatedMember().getUserName()\n +\n +def getModuleItemList(user=None):\n + gettext = portal.Localizer.erp5_ui.gettext\n \n -def getModuleItemList(user=None, portal_path=None):\n - gettext = context.Localizer.erp5_ui.gettext\n item_list = []\n for module_id in portal.objectIds(spec=(\'ERP5 Folder\',)):\n module = portal.restrictedTraverse(module_id, None)\n @@ -86,10 +87,10 @@ def getModuleItemList(user=None, portal_path=None):\n return item_list\n \n getModuleItemList = CachingMethod(getModuleItemList, \n - id=(\'ERP5Site_getModuleItemList\', context.Localizer.get_selected_language()),\n - cache_factory=\'erp5_ui_short\')\n -portal_path = context.getPortalObject().getPhysicalPath()\n -return getModuleItemList(user=user, portal_path=portal_path)\n + id=(\'ERP5Site_getModuleItemList\', portal.Localizer.get_selected_language()),\n + cache_factory=\'erp5_ui_short\')\n +\n +return getModuleItemList(user=user)\n </string> </value> </item> <item> @@ -142,11 +143,10 @@ return getModuleItemList(user=user, portal_path=portal_path)\n <string>CachingMethod</string> <string>_getattr_</string> <string>context</string> - <string>user</string> <string>portal</string> + <string>user</string> <string>None</string> <string>getModuleItemList</string> - <string>portal_path</string> </tuple> </value> </item> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index bccf25b7889cc5f7b0cd7ba58f4b40ae15f65262..c021767357fc642c79b907b2283be6bedc1c8971 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -557 \ No newline at end of file +558 \ No newline at end of file