Simplify fetching user assignment and its root site.

Those are single-valued, so just check consistency internally and return
a single value.
Changelog and some cleanups by Vincent Pelletier <vincent@nexedi.com>.

bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/DestructionSurvey_init.xml

@@ -50,13 +50,12 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>site_list = context.Baobab_getUserAssignedRootSiteList()\n
-if len(site_list) == 0:\n
+            <value> <string>site = context.Baobab_getUserAssignedRootSite()\n
+if site in (\'\', None):\n
   from Products.ERP5Type.Message import Message\n
   message = Message(domain="ui", message="The owner is not assigned to the right vault.")\n
   raise ValueError,message\n
 \n
-site = site_list[0]\n
 \n
 context.setSource("%s/caveau/auxiliaire/encaisse_des_billets_a_ventiler_et_a_detruire" %(site,))\n
 context.setDestination("%s/caveau/auxiliaire/encaisse_des_billets_ventiles_et_detruits" %(site,))\n

bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MonetaryReceptionModule_importMonetaryReceptionFromCDAction.xml

@@ -236,11 +236,11 @@ def split_head(CD_file_line_list):\n
     return {\'error\':True, \'message\':message_dict[\'12\'], \'head_dict\':{}}\n
 \n
   # Define destination\n
-  user_site_list = context.Baobab_getUserAssignedRootSiteList()\n
-  if user_site_list is None:\n
+  user_site = context.Baobab_getUserAssignedRootSite()\n
+  if user_site is None:\n
     return {\'error\':True, \'message\':message_dict[\'13\'], \'head_dict\':{}}\n
 \n
-  head_destination  = \'%s/%s\' % (user_site_list[0],\'caveau/serre\')\n
+  head_destination  = \'%s/%s\' % (user_site,\'caveau/serre\')\n
   if head_emission_letter in context.Baobab_getUserEmissionLetterList():\n
     head_destination = \'%s/%s\' % (head_destination,\'encaisse_des_billets_neufs_non_emis\')\n
   else:\n

bt5/erp5_banking_cash/SkinTemplateItem/portal_skins/erp5_banking_cash/MutilatedBanknote_init.xml

@@ -50,7 +50,7 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>user_site = context.Baobab_getUserAssignedRootSiteList()[0]\n
+            <value> <string>user_site = context.Baobab_getUserAssignedRootSite()\n
 user_counter = context.Baobab_getUserAssignedSiteList()[0]\n
 if user_site in (\'\', None) or user_counter in (\'\', None):\n
   raise ValueError, "Unable to determine site"\n

bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/CheckDeposit_init.xml

@@ -52,7 +52,7 @@
             <key> <string>_body</string> </key>
             <value> <string>transaction = context\n
 \n
-user_site = context.Baobab_getUserAssignedRootSiteList()[0]\n
+user_site = context.Baobab_getUserAssignedRootSite()\n
 context.setSite(user_site)\n
 \n
 # XXX it might be better to set resource according to source_payment.\n

bt5/erp5_banking_check/SkinTemplateItem/portal_skins/erp5_banking_check_operation/StopPayment_init.xml

@@ -53,7 +53,7 @@
             <value> <string>reference_currency = context.Baobab_getPortalReferenceCurrencyID()\n
 context.setPriceCurrency(\'currency_module/%s\' %(reference_currency,))\n
 context.setCurrencyExchangeType(\'transfer\')\n
-site = context.Baobab_getUserAssignedRootSiteList()[0]\n
+site = context.Baobab_getUserAssignedRootSite()\n
 context.setSource(site)\n
 </string> </value>
         </item>

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_checkStockBeforeClosingDate.xml

@@ -60,7 +60,7 @@ from Products.ERP5Type.Message import Message\n
 from Products.DCWorkflow.DCWorkflow import ValidationFailed\n
 \n
 if site is None:\n
-  root_site_url = context.Baobab_getUserAssignedRootSiteList()[0]\n
+  root_site_url = context.Baobab_getUserAssignedRootSite()\n
   site = context.portal_categories.restrictedTraverse(root_site_url)\n
 \n
 resource_uid_list = [x.uid for x in context.currency_cash_module.searchFolder()]\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getCounterStockList.xml

@@ -57,7 +57,7 @@ if site is None:\n
   if getattr(context,\'getSiteValue\',None) is not None:\n
     site = context.getSiteValue()\n
 if site is None:\n
-  root_site_url = context.Baobab_getUserAssignedRootSiteList()[0]\n
+  root_site_url = context.Baobab_getUserAssignedRootSite()\n
   site = context.portal_categories.restrictedTraverse(root_site_url)\n
 \n
 resource_uid_list = [x.uid for x in context.currency_cash_module.searchFolder()]\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedFunctionList.xml

@@ -61,11 +61,11 @@ if user_id is None:\n
 \n
 def getFunctionList(user_id=user_id):\n
 \n
-  valid_assignment_list = context.Baobab_getUserAssignmentList(user_id=user_id)\n
+  valid_assignment = context.Baobab_getUserAssignment(user_id=user_id)\n
 \n
   function_list = []\n
-  for a in valid_assignment_list:\n
-    new_function_list = a.getFunctionList()\n
+  if valid_assignment != None:\n
+    new_function_list = valid_assignment.getFunctionList()\n
     if len(new_function_list)>0:\n
       function_list.extend(new_function_list)\n
   return function_list\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedGroupList.xml

@@ -59,11 +59,11 @@ if user_id is None:\n
 \n
 def getGroupList(user_id=user_id):\n
 \n
-  valid_assignment_list = context.Baobab_getUserAssignmentList(user_id=user_id)\n
+  valid_assignment = context.Baobab_getUserAssignment(user_id=user_id)\n
 \n
   group_list = []\n
-  for a in valid_assignment_list:\n
-    new_group = a.getGroup()\n
+  if valid_assignment != None:\n
+    new_group = valid_assignment.getGroup()\n
     if not new_group.startswith(\'group\'):\n
       new_group=\'group/%s\' % new_group\n
     if new_group not in (\'\', None):\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedRootSiteList.xml → bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedRootSite.xml

@@ -50,28 +50,17 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string># get the current logged user root site (agency)\n
-\n
-valid_assignment_list = context.Baobab_getUserAssignmentList(user_id=user_id)\n
-\n
-site_list = []\n
-for a in valid_assignment_list:\n
-  new_site = a.getSiteValue()\n
-  while new_site.getVaultType()!=\'site\':\n
-    new_site = new_site.getParentValue()\n
-  if object:\n
-    if new_site not in site_list:\n
-      site_list.append(new_site)\n
-  else:\n
-    site_url = new_site.getRelativeUrl()\n
-    if site_url not in site_list:\n
-      site_list.append(site_url)\n
-return site_list\n
+            <value> <string>new_site = context.Baobab_getUserAssignment(user_id=user_id).getSiteValue()\n
+while new_site.getVaultType() != \'site\':\n
+  new_site = new_site.getParentValue()\n
+if not object:\n
+  new_site = new_site.getRelativeUrl()\n
+return new_site\n
 </string> </value>
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>user_id=None, object=0, **kw</string> </value>
+            <value> <string>user_id=None, object=False</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>
@@ -83,7 +72,7 @@ return site_list\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Baobab_getUserAssignedRootSiteList</string> </value>
+            <value> <string>Baobab_getUserAssignedRootSite</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignedSiteList.xml

@@ -59,11 +59,11 @@ if user_id is None:\n
 \n
 def getSiteList(user_id=user_id):\n
 \n
-  valid_assignment_list = context.Baobab_getUserAssignmentList(user_id=user_id)\n
+  valid_assignment = context.Baobab_getUserAssignment(user_id=user_id)\n
 \n
   site_list = []\n
-  for a in valid_assignment_list:\n
-    new_site = a.getSite()\n
+  if valid_assignment != None:\n
+    new_site = valid_assignment.getSite()\n
     if not new_site.startswith(\'site\'):\n
       new_site=\'site/%s\' % new_site\n
     if new_site not in (\'\', None):\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignmentList.xml → bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserAssignment.xml

@@ -52,35 +52,25 @@
             <key> <string>_body</string> </key>
             <value> <string encoding="cdata"><![CDATA[
 
-# get the current logged user site\n
 if user_id is None:\n
-  login = context.portal_membership.getAuthenticatedMember().getUserName()\n
-else:\n
-  login = user_id\n
-persons = context.acl_users.erp5_users.getUserByLogin(login)\n
-\n
-if len(persons) == 0:\n
-  #context.log(\'Baobab_getUserAssignementList\', \'Person %s not found\' %(login))\n
-  return []\n
-else:\n
-  #person = persons[0].getObject()\n
-  person = persons[0]\n
-\n
-assignment_list = person.contentValues(filter={\'portal_type\': \'Assignment\'})\n
-\n
-if len(assignment_list) == 0:\n
-  return []\n
-\n
-valid_assignment_list = []\n
-#context.log("Baobab_getUserAssignmentList", "assignment_list = %s" %(assignment_list,))\n
-for a in assignment_list:\n
-  if a.getValidationState() == \'open\':\n
-    stop  = a.getStopDate()\n
-    start = a.getStartDate()\n
-    if (stop > DateTime() or stop == None) and (start < DateTime() or start == None): \n
-      valid_assignment_list.append(a)\n
-\n
-return valid_assignment_list\n
+  user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n
+person_list = context.acl_users.erp5_users.getUserByLogin(user_id)\n
+if not person_list:\n
+  return None\n
+assignment_list = person_list[0].contentValues(filter={\'portal_type\': \'Assignment\'})\n
+if not assignment_list:\n
+  return None\n
+valid_assignment = None\n
+now = DateTime()\n
+for assignment in assignment_list:\n
+  if assignment.getValidationState() == \'open\':\n
+    stop = assignment.getStopDate()\n
+    start = assignment.getStartDate()\n
+    if (stop is None or stop > now) and (start is None or start < now):\n
+      if valid_assignment is not None:\n
+        raise ValueError(\'There are too many valid assignments for user %r\' % (user_id, ))\n
+      valid_assignment = assignment\n
+return valid_assignment\n
 
 
 ]]></string> </value>
@@ -99,7 +89,7 @@ return valid_assignment_list\n
         </item>
         <item>
             <key> <string>id</string> </key>
-            <value> <string>Baobab_getUserAssignmentList</string> </value>
+            <value> <string>Baobab_getUserAssignment</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getUserSiteUid.xml

@@ -55,7 +55,7 @@
 user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n
 \n
 def getUserSiteUid(user_id):\n
-  return context.Baobab_getUserAssignedRootSiteList(user_id=user_id, object=1)[0].getSiteUid()\n
+  return context.Baobab_getUserAssignedRootSite(user_id=user_id, object=1).getSiteUid()\n
 \n
 \n
 getUserSiteUid = CachingMethod(getUserSiteUid, id=\'Baobab_getUserUserSiteUid\', cache_factory=\'erp5_ui_medium\')\n

bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Delivery_getVaultItemList.xml

@@ -81,18 +81,17 @@
 from Products.ERP5Type.Cache import CachingMethod\n
 \n
 def getVaultItemList(vault_type=None, exclude_vault_type=None,\n
-    user_site=1, leaf_node=1, strict_membership=0, assignment_list=None,\n
+    user_site=1, leaf_node=1, strict_membership=0, assignment=None,\n
     site_list=None, with_base=1, all=0, first_level=0,main_agency=0,\n
     exclude_site_list=None,mode_test=0):\n
 \n
   if vault_type is None:\n
     organisation_list = []\n
-    for assignment in assignment_list :\n
 # XXX FOR NOW, LET\'S USE SITE UNTIL THE LINK BETWEEN ORGANISATIONS AND SITE HAS BEEN SORTED OUT XXX\n
-#      organisation = assignment.getDestinationValue().getMapping()\n
-      organisation = assignment.getSiteValue()\n
-      if organisation is not None:\n
-        organisation_list.append(organisation)\n
+#   organisation = assignment.getDestinationValue().getMapping()\n
+    organisation = assignment.getSiteValue()\n
+    if organisation is not None:\n
+      organisation_list.append(organisation)\n
 \n
     vault_type_dict = {}\n
     for organisation in organisation_list:\n
@@ -205,9 +204,9 @@ getVaultItemList = CachingMethod(getVaultItemList, id=(\'Delivery_getVaultItemLi
 \n
 \n
 if vault_type is None:\n
-  assignment_list = context.Baobab_getUserAssignmentList()\n
+  assignment = context.Baobab_getUserAssignment()\n
 else:\n
-  assignment_list = None\n
+  assignment = None\n
 \n
 erp5_site = context.getPortalObject()\n
 mode_test = 0\n
@@ -255,7 +254,7 @@ if exclude_user_site:\n
 \n
 vault_list = getVaultItemList(vault_type=vault_type, exclude_vault_type=exclude_vault_type,\n
   user_site=user_site, leaf_node=leaf_node, strict_membership=strict_membership,\n
-  assignment_list=assignment_list, site_list=site_list, with_base=with_base, all=all,\n
+  assignment=assignment, site_list=site_list, with_base=with_base, all=all,\n
   first_level=first_level,main_agency=main_agency,exclude_site_list=exclude_site_list,\n
   mode_test=mode_test)\n
 \n

bt5/erp5_banking_inventory/SkinTemplateItem/portal_skins/erp5_banking_inventory/CashInventory_view/my_destination.xml

@@ -269,7 +269,7 @@
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python: here.Delivery_getVaultItemList(all=1,user_site=0,base_site=here.Baobab_getUserAssignedRootSiteList()[0],vault_type=\'site\',leaf_node=0, current_url=here.getDestination())</string> </value>
+            <value> <string>python: here.Delivery_getVaultItemList(all=1,user_site=0,base_site=here.Baobab_getUserAssignedRootSite(),vault_type=\'site\',leaf_node=0, current_url=here.getDestination())</string> </value>
         </item>
       </dictionary>
     </pickle>