From f5e3f6fe845509389d008f8b5720916a6de099cd Mon Sep 17 00:00:00 2001
From: Sebastien Robin <seb@nexedi.com>
Date: Mon, 26 Mar 2007 12:47:39 +0000
Subject: [PATCH] defined cache factory instead of cache duration
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13644 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_banking_core/Baobab_getCheckbookTypeItemList.xml | 4 +++-
.../erp5_banking_core/Baobab_getResourceVintageList.xml | 4 +++-
.../Baobab_getUserAssignedFunctionList.xml | 3 ++-
.../erp5_banking_core/Baobab_getUserAssignedSiteList.xml | 2 +-
.../erp5_banking_core/Baobab_getVaultCurrency.xml | 6 +-----
.../erp5_banking_core/CurrencyExchange_getCurrencyList.xml | 3 ++-
.../erp5_banking_core/Delivery_getVaultItemList.xml | 7 ++++---
.../erp5_banking_core/Movement_lookupPrice.xml | 6 +++---
bt5/erp5_banking_core/bt/revision | 2 +-
9 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCheckbookTypeItemList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCheckbookTypeItemList.xml
index 04c248126e..bc64dc65ea 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCheckbookTypeItemList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCheckbookTypeItemList.xml
@@ -71,7 +71,9 @@ def getCheckbookTypeItemList():\n
return [(\'\', \'\')] + [(x.getTitle(), x.getRelativeUrl())\n
for x in context.checkbook_type_module.objectValues()]\n
\n
-getCheckbookTypeItemList = CachingMethod(getCheckbookTypeItemList, id = \'Baobab_getCheckbookTypeItemList\', cache_duration = 3600)\n
+getCheckbookTypeItemList = CachingMethod(getCheckbookTypeItemList, \n
+ id = \'Baobab_getCheckbookTypeItemList\', \n
+ cache_factory = \'erp5_ui_medium\')\n
return getCheckbookTypeItemList()\n
</string> </value>
</item>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml
index 7ad4b3786a..db382abc3a 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getResourceVintageList.xml
@@ -85,7 +85,9 @@ def getResourceVintageList(banknote=0, coin=0):\n
return variation_list.keys()\n
\n
\n
-getResourceVintageList = CachingMethod(getResourceVintageList, id=\'Baobab_getResourceVintageList\', cache_duration=360000)\n
+getResourceVintageList = CachingMethod(getResourceVintageList, \n
+ id=\'Baobab_getResourceVintageList\', \n
+ cache_factory="erp5_ui_long")\n
\n
return getResourceVintageList(banknote, coin)\n
</string> </value>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedFunctionList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedFunctionList.xml
index 75502925d4..fa0b16bba7 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedFunctionList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedFunctionList.xml
@@ -85,7 +85,8 @@ def getFunctionList(user_id=user_id):\n
function_list.extend(new_function_list)\n
return function_list\n
\n
-getFunctionList = CachingMethod(getFunctionList, id=\'Baobab_getUserAssignedFunctionList\', cache_duration=300)\n
+getFunctionList = CachingMethod(getFunctionList, id=\'Baobab_getUserAssignedFunctionList\', \n
+ cache_factory="erp5_ui_short")\n
return getFunctionList()\n
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedSiteList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedSiteList.xml
index 097128fbd8..b2d23765e3 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedSiteList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedSiteList.xml
@@ -85,7 +85,7 @@ def getSiteList(user_id=user_id):\n
site_list.append(new_site)\n
return site_list\n
\n
-getSiteList = CachingMethod(getSiteList, id=\'Baobab_getUserAssignedSiteList\', cache_duration=300)\n
+getSiteList = CachingMethod(getSiteList, id=\'Baobab_getUserAssignedSiteList\', cache_factory=\'erp5_ui_short\')\n
return getSiteList(user_id=user_id)\n
</string> </value>
</item>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultCurrency.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultCurrency.xml
index 4a06ea3a7d..2c7ca9b91f 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultCurrency.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getVaultCurrency.xml
@@ -67,13 +67,11 @@
<key> <string>_body</string> </key>
<value> <string># This script will try to guess what is the current currency\n
# for the particular vault\n
-from Products.ERP5Type.Cache import CachingMethod\n
\n
vault_list = vault.split(\'/\')\n
currency_id = None\n
# Well, this is not a nice way of doing, we should have\n
# a mapping or something instead\n
-context.log(\'Baobab_getVaultCurrency vault_list\',vault_list)\n
if \'encaisse_des_devises\' in vault_list:\n
vault_currency_title = vault_list[vault_list.index(\'encaisse_des_devises\')+1]\n
for currency in context.currency_module.objectValues():\n
@@ -131,16 +129,14 @@ return context.currency_module[context.Baobab_getPortalReferenceCurrencyID()].ge
<tuple>
<string>vault</string>
<string>kw</string>
- <string>Products.ERP5Type.Cache</string>
- <string>CachingMethod</string>
<string>_getattr_</string>
<string>vault_list</string>
<string>None</string>
<string>currency_id</string>
- <string>context</string>
<string>_getitem_</string>
<string>vault_currency_title</string>
<string>_getiter_</string>
+ <string>context</string>
<string>currency</string>
<string>currency_title</string>
</tuple>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyExchange_getCurrencyList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyExchange_getCurrencyList.xml
index b4c4949365..c632c750bd 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyExchange_getCurrencyList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/CurrencyExchange_getCurrencyList.xml
@@ -78,7 +78,8 @@ def getCurrencyList(exclude_reference_currency=0):\n
currency_list.insert(0, (\'\',\'\'))\n
return currency_list\n
\n
-getCurrencyList = CachingMethod(getCurrencyList, id = \'CurrencyExchange_getCurrencyList\', cache_duration = 3600)\n
+getCurrencyList = CachingMethod(getCurrencyList, id = \'CurrencyExchange_getCurrencyList\', \n
+ cache_factory = "erp5_ui_medium")\n
return getCurrencyList(exclude_reference_currency=exclude_reference_currency)\n
</string> </value>
</item>
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml
index 991fd2975c..e0f2258c57 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml
@@ -77,10 +77,10 @@
# Delivery_getVaultItemList utilis\xc3\xa9 dans le TALES de my_source dans le formulaire\n
# user_site = 1 : Permet de s\xc3\xa9lectionner uniquement les encaisses des sites auquels l\'user est affect\xc3\xa9,\n
# au lieu des encaisses de tous le sites\n
-# exclude_user_site = 0 : Permet de ne pas s\xe9lectionner les encaisses du site auquel appartient l\'utilisateur\n
+# exclude_user_site = 0 : Permet de ne pas s\xef\xbf\xbdlectionner les encaisses du site auquel appartient l\'utilisateur\n
# owner_site = 1 : Permet de s\xc3\xa9lectionner uniquement les encaisses des sites auquels le propri\xc3\xa9taire du document est affect\xc3\xa9,\n
# au lieu des encaisses de tous le sites\n
-# main_agency = 0 : Permet de s\xc3\xa9lectionner uniquement les encaisses des sites qui appartiennent \xe0 une agence principale,\n
+# main_agency = 0 : Permet de s\xc3\xa9lectionner uniquement les encaisses des sites qui appartiennent \xef\xbf\xbd une agence principale,\n
# leaf_node = 1 : S\xc3\xa9lectionne uniquement les noeuds qui sont des feuilles de l\'arbre (qui n\'ont pas de sous-cat\xc3\xa9gories)\n
# strict_membership = 0 : Appartenance stricte. Si vault_type=\'site\', on s\xc3\xa9lectionnera \'site/agence/principale/paris\',\n
# mais pas \'site/agence/principale/paris/caveau\', \'site/agence/principale/paris/surface\' et\n
@@ -216,7 +216,8 @@ def getVaultItemList(vault_type=None, exclude_vault_type=None,\n
vault_list.sort()\n
return vault_list\n
\n
-getVaultItemList = CachingMethod(getVaultItemList, id=(\'Delivery_getVaultItemList\', \'getVaultItemList\'), cache_duration=None)\n
+getVaultItemList = CachingMethod(getVaultItemList, id=(\'Delivery_getVaultItemList\', \'getVaultItemList\'), \n
+ cache_factory=\'erp5_ui_long\')\n
\n
if vault_type is None:\n
assignment_list = context.Baobab_getUserAssignmentList()\n
diff --git a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Movement_lookupPrice.xml b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Movement_lookupPrice.xml
index f9d4a0ba3f..843ea40084 100644
--- a/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Movement_lookupPrice.xml
+++ b/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Movement_lookupPrice.xml
@@ -74,7 +74,8 @@ def Movement_lookupPrice():\n
else:\n
return None\n
\n
-return CachingMethod(Movement_lookupPrice, (\'erp5_banking_core/Movement_lookupPrice\', context.getResource()), cache_duration=None)()\n
+return CachingMethod(Movement_lookupPrice, (\'erp5_banking_core/Movement_lookupPrice\', context.getResource()), \n
+ cache_factory="erp5_ui_long")()\n
</string> </value>
</item>
<item>
@@ -128,8 +129,7 @@ return CachingMethod(Movement_lookupPrice, (\'erp5_banking_core/Movement_lookupP
<string>CachingMethod</string>
<string>Movement_lookupPrice</string>
<string>_getattr_</string>
-<string>context</string>
- <string>None</string>
+ <string>context</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_banking_core/bt/revision b/bt5/erp5_banking_core/bt/revision
index 3968aef87f..89a16a7ddc 100644
--- a/bt5/erp5_banking_core/bt/revision
+++ b/bt5/erp5_banking_core/bt/revision
@@ -1 +1 @@
-170
\ No newline at end of file
+172
\ No newline at end of file
--
2.30.9