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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Apr 23 08:30:56 2009
New Revision: 26601

URL: http://svn.erp5.org?rev=26601&view=rev
Log:
revert r.26569 partially. this script will be modified again with other UI changes.

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=26601&r1=26600&r2=26601&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml [utf8] Thu Apr 23 08:30:56 2009
@@ -75,11 +75,7 @@
           for x in fallback_category.getCategoryChildCompactLogicalPathItemList(base=1) if x[0]])\n
         break\n
 \n
-  for i in item_list:\n
-    if i[0] != \'\':\n
-      category_list.append([\'%s/%s\' % (item, i[0]), i[1]])\n
-    else:\n
-      category_list.append(i)\n
+  category_list.extend(item_list)\n
 \n
 return category_list\n
 </string> </value>
@@ -135,7 +131,6 @@
                             <string>append</string>
                             <string>$append0</string>
                             <string>x</string>
-                            <string>i</string>
                           </tuple>
                         </value>
                     </item>

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=26601&r1=26600&r2=26601&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu Apr 23 08:30:56 2009
@@ -1,1 +1,1 @@
-1167
+1168