[Erp5-report] r44792 jerome - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/e...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Mar 30 13:40:58 2011
New Revision: 44792

URL: http://svn.erp5.org?rev=44792&view=rev
Log:
That script was responsible for setting [None] as site list on ingested documents. Refactor it a little to do costly things inside the cached method

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getPersonCareerDict.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getPersonCareerDict.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getPersonCareerDict.xml?rev=44792&r1=44791&r2=44792&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getPersonCareerDict.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/ERP5Site_getPersonCareerDict.xml [utf8] Wed Mar 30 13:40:58 2011
@@ -56,29 +56,27 @@
 \n
 from Products.ERP5Type.Cache import CachingMethod\n
 \n
-portal = context.getPortalObject()\n
-result = {\'group_list\': [],\n
-          \'site_list\': [],\n
-          }\n
-person = portal.ERP5Site_getAuthenticatedMemberPersonValue(user_name=user_name)\n
-if person is None:\n
-  return result\n
+def getPersonCareerDict(user_name):\n
+  portal = context.getPortalObject()\n
+  result = {\'group_list\': [],\n
+            \'site_list\': [],\n
+            }\n
+  person = portal.ERP5Site_getAuthenticatedMemberPersonValue(user_name=user_name)\n
+  if person is None:\n
+    return result\n
 \n
-def getPersonCareerDict(username):\n
-  person = portal.restrictedTraverse(person_relative_url)\n
   group = person.getGroup()\n
   organisation = person.getSubordinationValue()\n
   if group is not None:\n
-    result[\'group_list\']=[group]\n
+    result[\'group_list\'] = [group]\n
   if organisation is not None:\n
-    result[\'site_list\']=[organisation.getSite()]\n
+    result[\'site_list\'] = organisation.getSiteList()\n
   return result\n
 \n
-person_relative_url = person.getRelativeUrl()\n
 getPersonCareerDict = CachingMethod(getPersonCareerDict,\n
                                     ("ERP5Site_getPersonCareerDict",),\n
-                                    cache_factory=\'erp5_ui_short\')\n
-return getPersonCareerDict(person_relative_url)\n
+                                    cache_factory=\'erp5_content_short\')\n
+return getPersonCareerDict(user_name)\n
 </string> </value>
         </item>
         <item>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=44792&r1=44791&r2=44792&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Wed Mar 30 13:40:58 2011
@@ -1 +1 @@
-965
+966
\ No newline at end of file