[Erp5-report] r13723 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Mar 27 17:27:01 2007
New Revision: 13723

URL: http://svn.erp5.org?rev=13723&view=rev
Log:
repair Predicate_getMembershipCriterionCategoryList for destination_region and add support for source_region as well.


Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml?rev=13723&r1=13722&r2=13723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml Tue Mar 27 17:27:01 2007
@@ -78,11 +78,11 @@
 \n
 category_list = []\n
 \n
-\n
 for item in mixed_list:\n
-  if item==\'destination_region\':\n
-    item = \'region\' # This must be made more generic\n
-    category_list += [\'destination_region/\' + x for x in context.portal_categories[item].getCategoryChildCompactLogicalPathItemList(base=1)]\n
+  if item in (\'destination_region\', \'source_region\'):\n
+    category = \'region\' # This must be made more generic\n
+    category_list += [(x[0], \'%s/%s\' % (item, x[1])) for x in \n
+                      context.portal_categories[category].getCategoryChildCompactLogicalPathItemList(base=1)]\n
   else:\n
     category_list += context.portal_categories[item].getCategoryChildCompactLogicalPathItemList(base=1)\n
 \n
@@ -137,6 +137,7 @@
                             <string>_getiter_</string>
                             <string>item</string>
                             <string>category_list</string>
+                            <string>category</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getitem_</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=13723&r1=13722&r2=13723&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Tue Mar 27 17:27:01 2007
@@ -1,1 +1,1 @@
-284
+285