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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Apr 29 16:31:20 2009
New Revision: 26714

URL: http://svn.erp5.org?rev=26714&view=rev
Log:
here, context is not a Predicate object but a ParallelListField. and there is no need to call a method upon the Predicate to get usable base categories.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_hashCategoryList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_hashCategoryList.xml?rev=26714&r1=26713&r2=26714&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_hashCategoryList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_hashCategoryList.xml [utf8] Wed Apr 29 16:31:20 2009
@@ -63,9 +63,11 @@
 default_sub_field_property_dict.update({\'field_type\':\'MultiListField\'})\n
 \n
 z = 0\n
-category_list = context.getMembershipCriterionBaseCategoryList()\n
-category_list += [i for i in context.getMultimembershipCriterionBaseCategoryList() \\\n
-                  if i not in category_list]\n
+category_list = []\n
+for x in item_list:\n
+  base_category = x[1].split(\'/\', 1)[0]\n
+  if base_category and base_category not in category_list:\n
+    category_list.append(base_category)\n
 \n
 for category in category_list:\n
   new_dict = default_sub_field_property_dict.copy()\n
@@ -127,20 +129,20 @@
                             <string>sub_field_list</string>
                             <string>_getattr_</string>
                             <string>z</string>
-                            <string>context</string>
                             <string>category_list</string>
-                            <string>_inplacevar_</string>
+                            <string>_getiter_</string>
+                            <string>x</string>
+                            <string>_getitem_</string>
+                            <string>base_category</string>
+                            <string>category</string>
+                            <string>new_dict</string>
                             <string>append</string>
                             <string>$append0</string>
-                            <string>_getiter_</string>
-                            <string>i</string>
-                            <string>category</string>
-                            <string>new_dict</string>
-                            <string>x</string>
                             <string>_write_</string>
-                            <string>_getitem_</string>
                             <string>str</string>
                             <string>len</string>
+                            <string>_inplacevar_</string>
+                            <string>context</string>
                             <string>request</string>
                           </tuple>
                         </value>

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=26714&r1=26713&r2=26714&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Apr 29 16:31:20 2009
@@ -1,1 +1,1 @@
-1189
+1192