[Erp5-report] r26569 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Apr 21 17:41:29 CEST 2009
Author: kazuhiko
Date: Tue Apr 21 17:41:28 2009
New Revision: 26569
URL: http://svn.erp5.org?rev=26569&view=rev
Log:
improve Predicate_view.
* group membership criteria related items.
* display base category id in membership values lists.
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_getMembershipCriterionCategoryList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_category_list.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=26569&r1=26568&r2=26569&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] Tue Apr 21 17:41:28 2009
@@ -75,7 +75,11 @@
for x in fallback_category.getCategoryChildCompactLogicalPathItemList(base=1) if x[0]])\n
break\n
\n
- category_list.extend(item_list)\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
\n
return category_list\n
</string> </value>
@@ -131,6 +135,7 @@
<string>append</string>
<string>$append0</string>
<string>x</string>
+ <string>i</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml?rev=26569&r1=26568&r2=26569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view.xml [utf8] Tue Apr 21 17:41:28 2009
@@ -58,7 +58,8 @@
<list>
<string>left</string>
<string>right</string>
- <string>center</string>
+ <string>center left</string>
+ <string>center right</string>
<string>bottom</string>
<string>hidden</string>
</list>
@@ -77,7 +78,16 @@
</value>
</item>
<item>
- <key> <string>center</string> </key>
+ <key> <string>center left</string> </key>
+ <value>
+ <list>
+ <string>my_membership_criterion_base_category_list</string>
+ <string>my_multimembership_criterion_base_category_list</string>
+ </list>
+ </value>
+ </item>
+ <item>
+ <key> <string>center right</string> </key>
<value>
<list>
<string>my_membership_criterion_category_list</string>
@@ -99,7 +109,6 @@
<value>
<list>
<string>my_title</string>
- <string>my_criterion_property_list</string>
<string>my_string_index</string>
<string>my_int_index</string>
<string>my_test_method_id</string>
@@ -110,8 +119,7 @@
<key> <string>right</string> </key>
<value>
<list>
- <string>my_membership_criterion_base_category_list</string>
- <string>my_multimembership_criterion_base_category_list</string>
+ <string>my_criterion_property_list</string>
</list>
</value>
</item>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_category_list.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_category_list.xml?rev=26569&r1=26568&r2=26569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_category_list.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_view/my_membership_criterion_category_list.xml [utf8] Tue Apr 21 17:41:28 2009
@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>size</string> </key>
- <value> <int>5</int> </value>
+ <value> <int>10</int> </value>
</item>
<item>
<key> <string>title</string> </key>
@@ -261,11 +261,8 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
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=26569&r1=26568&r2=26569&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Tue Apr 21 17:41:28 2009
@@ -1,1 +1,1 @@
-1164
+1165
More information about the Erp5-report
mailing list