From beed75dfb0981146b3e1fe5c8ada49e17dfbb271 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 4 May 2012 15:56:09 +0200 Subject: [PATCH] add portal_type in cache key for getResourceItemList because its result depends on portal_type too. --- .../erp5_crm/Ticket_getResourceItemList.xml | 13 ++++++------- bt5/erp5_crm/bt/revision | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getResourceItemList.xml b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getResourceItemList.xml index 62de9f2244..c102a1aa50 100644 --- a/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getResourceItemList.xml +++ b/bt5/erp5_crm/SkinTemplateItem/portal_skins/erp5_crm/Ticket_getResourceItemList.xml @@ -62,17 +62,16 @@ portal = context.getPortalObject()\n if not portal_type:\n portal_type = context.getPortalType()\n \n -preference_id = \'preferred_%s_use\' % \'_\'.join(token.lower() for token in portal_type.split(\' \'))\n -sql_kw = {\'portal_type\': portal.getPortalResourceTypeList(),\n - \'use_uid\': portal.portal_categories.getCategoryUid(portal.portal_preferences.getPreference(preference_id), base_category=\'use\'),\n - \'validation_state\': \'validated\',\n - \'sort_on\': \'title\'}\n -\n def getResourceItemList(portal_type):\n + preference_id = \'preferred_%s_use\' % \'_\'.join(token.lower() for token in portal_type.split(\' \'))\n + sql_kw = {\'portal_type\': portal.getPortalResourceTypeList(),\n + \'use_uid\': portal.portal_categories.getCategoryUid(portal.portal_preferences.getPreference(preference_id), base_category=\'use\'),\n + \'validation_state\': \'validated\',\n + \'sort_on\': \'title\'}\n return [(\'\', \'\')] + [(result.getTitle(), result.getRelativeUrl()) for result in portal.portal_catalog(**sql_kw)]\n \n getResourceItemList = CachingMethod(getResourceItemList, \n - id=(script.id, context.Localizer.get_selected_language()), \n + id=(script.id, portal_type, context.Localizer.get_selected_language()), \n cache_factory=\'erp5_ui_long\')\n \n result_list = getResourceItemList(portal_type)[:]\n diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision index 7dfce3516b..6001de1bbe 100644 --- a/bt5/erp5_crm/bt/revision +++ b/bt5/erp5_crm/bt/revision @@ -1 +1 @@ -594 \ No newline at end of file +595 \ No newline at end of file -- 2.30.9