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

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Mar 17 15:27:04 2010
New Revision: 33801

URL: http://svn.erp5.org?rev=33801&view=rev
Log:
Request form was included in HTML, so this cause problem when it contains "
This fixes testSimpleRelationFieldWheelButtonQuotedFields
Make sure to update ERP5Form and erp5_core at same time

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
    erp5/trunk/products/ERP5Form/Tool/SelectionTool.py

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml?rev=33801&r1=33800&r2=33801&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_editRelation.xml [utf8] Wed Mar 17 15:27:04 2010
@@ -70,6 +70,10 @@
   uids = selection_tool.getSelectionCheckedUidsFor(selection_name)\n
 \n
 old_request = dict(saved_form_data)\n
+for k, v in old_request.items():\n
+  if isinstance(v, str):\n
+    old_request[k] = v.decode(\'base64\')\n
+\n
 \n
 field = getattr(context, form_id).get_field(field_id)\n
 field_key = field.generate_field_key()\n
@@ -154,19 +158,21 @@
                             <string>selected_uids</string>
                             <string>dict</string>
                             <string>old_request</string>
+                            <string>_getiter_</string>
+                            <string>k</string>
+                            <string>v</string>
+                            <string>isinstance</string>
+                            <string>str</string>
+                            <string>_write_</string>
                             <string>getattr</string>
                             <string>field</string>
                             <string>field_key</string>
                             <string>len</string>
                             <string>_getitem_</string>
                             <string>sub_field_key</string>
-                            <string>str</string>
-                            <string>_write_</string>
                             <string>container</string>
                             <string>request</string>
                             <string>request_form</string>
-                            <string>_getiter_</string>
-                            <string>k</string>
                             <string>edit_method</string>
                             <string>True</string>
                           </tuple>

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=33801&r1=33800&r2=33801&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Mar 17 15:27:04 2010
@@ -1,1 +1,1 @@
-1517
+1518

Modified: erp5/trunk/products/ERP5Form/Tool/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Tool/SelectionTool.py?rev=33801&r1=33800&r2=33801&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Tool/SelectionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/Tool/SelectionTool.py [utf8] Wed Mar 17 15:27:04 2010
@@ -1207,7 +1207,9 @@
         saved_form_data = {}
         for key, value in REQUEST.form.items():
           if not isinstance(value, FileUpload):
-              saved_form_data[key] = value
+            if isinstance(value, basestring):
+              value = value.encode('base64')
+            saved_form_data[key] = value
 
         base_category = None
         kw = {}