[Erp5-report] r44340 vincent - in /erp5/trunk/bt5/erp5_banking_core: SkinTemplateItem/porta...

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Mar 16 14:06:33 2011
New Revision: 44340

URL: http://svn.erp5.org?rev=44340&view=rev
Log:
Cleanup script.

Get rid of dead (commented-out) code.
Reindent & factorise remaining code.
Add an XXX about bad script naming.

Modified:
    erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml
    erp5/trunk/bt5/erp5_banking_core/bt/revision

Modified: erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml?rev=44340&r1=44339&r2=44340&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_core/SkinTemplateItem/portal_skins/erp5_banking_core/Baobab_getPossibleUserAssignmentSiteList.xml [utf8] Wed Mar 16 14:06:33 2011
@@ -54,33 +54,26 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string># return site of the user and possible counter on wich user can be assigned\n
-if context.getDestination() is None:\n
+# XXX: this script should be named "Assignment_getPossibleSiteList", as it is not used anywhere else\n
+destination_value = context.getDestinationValue()\n
+if destination_value is None:\n
   # must have an organisation defined to limit site diplayed\n
   return [[\'\', \'\']]\n
 \n
-#dest_site_title = context.getDestinationValue().getSiteTitle()\n
-\n
-site_list = context.Delivery_getVaultItemList(user_site=0, vault_type=("site", "site/surface/banque_interne/guichet", "site/surface/gros_paiement/guichet", "site/surface/gros_versement/guichet", "site/surface/operations_diverses/guichet"), first_level=1, strict_membership=1, leaf_node=0, base_site=context.getDestinationValue().getSite())\n
-# now must filter again this list to remove useless categories\n
-#site_dict = {}\n
-#for site in site_list:\n
-#  site_dict[site[0]] = site[1]\n
-#  site_split = site[0].split(\'/\')\n
-#  if dest_site_title in site_split:\n
-#    if len(site_split) == 4:\n
-#      # case of counter\n
-#      counter = "/".join(site_split[:-1])\n
-#      if not site_dict.has_key(counter):\n
-#        if not \'siege\' in site[1]:\n
-#          site_dict[counter] = \'/\'.join(site[1].split("/")[:7])\n
-#        else:\n
-#          site_dict[counter] = \'/\'.join(site[1].split("/")[:6])\n
-#    else:\n
-#      site_dict[site[0]] = site[1]\n
-\n
-#list = site_dict.items()\n
-#list.sort()\n
-#return list\n
+site_list = context.Delivery_getVaultItemList(\n
+  user_site=0,\n
+  vault_type=(\n
+    \'site\',\n
+    \'site/surface/banque_interne/guichet\',\n
+    \'site/surface/gros_paiement/guichet\',\n
+    \'site/surface/gros_versement/guichet\',\n
+    \'site/surface/operations_diverses/guichet\',\n
+  ),\n
+  first_level=1,\n
+  strict_membership=1,\n
+  leaf_node=0,\n
+  base_site=destination_value.getSite(),\n
+)\n
 return site_list\n
 </string> </value>
         </item>
@@ -120,6 +113,7 @@ return site_list\n
                           <tuple>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>destination_value</string>
                             <string>None</string>
                             <string>site_list</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_banking_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_banking_core/bt/revision?rev=44340&r1=44339&r2=44340&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_banking_core/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_banking_core/bt/revision [utf8] Wed Mar 16 14:06:33 2011
@@ -1 +1 @@
-551
\ No newline at end of file
+552