[Erp5-report] r34214 fabien - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplat...

[nobody at svn.erp5.org]

Author: fabien
Date: Tue Mar 30 17:49:08 2010
New Revision: 34214

URL: http://svn.erp5.org?rev=34214&view=rev
Log:
(multi)membership_criterion_base_category_list cannot be get on the context, use the request instead

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_validateMembershipCriterionDocument.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_validateMembershipCriterionDocument.xml?rev=34214&r1=34213&r2=34214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_validateMembershipCriterionDocument.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_validateMembershipCriterionDocument.xml [utf8] Tue Mar 30 17:49:08 2010
@@ -53,8 +53,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>category_list = context.getMembershipCriterionBaseCategoryList()\n
-category_list += [i for i in context.getMultimembershipCriterionBaseCategoryList() \\\n
+            <value> <string>category_list = request.get(\'field_my_membership_criterion_base_category_list\', [])\n
+if not same_type(category_list, []):\n
+  category_list = [category_list]\n
+multimembership_criterion_base_category_list = request.get(\'field_my_multimembership_criterion_base_category_list\', [])\n
+if not same_type(multimembership_criterion_base_category_list, []):\n
+  multimembership_criterion_base_category_list = [multimembership_criterion_base_category_list]\n
+category_list += [i for i in multimembership_criterion_base_category_list \\\n
                   if i not in category_list]\n
 portal_categories = context.getPortalObject().portal_categories\n
 \n
@@ -103,13 +108,15 @@
                             <string>item_list</string>
                             <string>request</string>
                             <string>_getattr_</string>
-                            <string>context</string>
                             <string>category_list</string>
+                            <string>same_type</string>
+                            <string>multimembership_criterion_base_category_list</string>
                             <string>_inplacevar_</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>_getiter_</string>
                             <string>i</string>
+                            <string>context</string>
                             <string>portal_categories</string>
                             <string>item</string>
                             <string>base_category</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=34214&r1=34213&r2=34214&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Tue Mar 30 17:49:08 2010
@@ -1,1 +1,1 @@
-1541
+1544