[Erp5-report] r33372 fabien - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/er...

[nobody at svn.erp5.org]

Author: fabien
Date: Thu Mar  4 10:11:43 2010
New Revision: 33372

URL: http://svn.erp5.org?rev=33372&view=rev
Log:
add web_site_id to the cache method id as an instance can have many web_sites using admin toolbar

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml?rev=33372&r1=33371&r2=33372&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_getToolbarModuleItemList.xml [utf8] Thu Mar  4 10:11:43 2010
@@ -64,6 +64,8 @@
 \n
 portal = context.getPortalObject()\n
 user = portal.portal_membership.getAuthenticatedMember().getUserName()\n
+web_site_id = getattr(context, \'getWebSiteValue\', None) is not None and \\\n
+    context.getWebSiteValue().getId()\n
 \n
 def getModuleItemList(user=None):\n
   gettext = portal.Localizer.erp5_ui.gettext\n
@@ -78,8 +80,8 @@
   item_list.sort(key=lambda x: x[0])\n
   return item_list\n
 \n
-getModuleItemList = CachingMethod(getModuleItemList,  \n
-  id=(\'WebSection_getToolbarModuleItemList\', portal.Localizer.get_selected_language(), portal.portal_url()),\n
+getModuleItemList = CachingMethod(getModuleItemList,\n
+  id=(\'WebSection_getToolbarModuleItemList\', portal.Localizer.get_selected_language(), portal.portal_url(), web_site_id),\n
       cache_factory=\'erp5_ui_short\')\n
 \n
 return getModuleItemList(user=user)\n
@@ -127,6 +129,8 @@
                             <string>context</string>
                             <string>portal</string>
                             <string>user</string>
+                            <string>getattr</string>
+                            <string>web_site_id</string>
                             <string>getModuleItemList</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=33372&r1=33371&r2=33372&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Thu Mar  4 10:11:43 2010
@@ -1,1 +1,1 @@
-912
+913