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

[nobody at svn.erp5.org]

Author: yusei
Date: Thu Nov 29 13:56:15 2007
New Revision: 17901

URL: http://svn.erp5.org?rev=17901&view=rev
Log:
2007-11-29 yusei
* Fixed Predicate_edit to use ignore_layout and editable_mode parameters in redirect url.

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

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml?rev=17901&r1=17900&r2=17901&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Predicate_edit.xml Thu Nov 29 13:56:15 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -68,17 +65,15 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-# Updates attributes of an Zope document\n
+            <value> <string># Updates attributes of an Zope document\n
 # which is in a class inheriting from ERP5 Base\n
 #\n
 # TODO\n
 #   - Implement validation of matrix fields\n
 #   - Implement validation of list fields\n
 #\n
-\n
 from Products.Formulator.Errors import ValidationError, FormValidationError\n
+from ZTUtils import make_query\n
 \n
 request=context.REQUEST\n
 \n
@@ -121,24 +116,28 @@
   return form(request)\n
 else:\n
   if not selection_index:\n
-    redirect_url = \'%s/%s?%s\' % ( context.absolute_url()\n
-                              , form_id\n
-                              , \'portal_status_message=Data+Updated.\'\n
-                              )\n
+    redirect_url = \'%s/%s?%s\' % (\n
+      context.absolute_url(),\n
+      form_id,\n
+      make_query({\'ignore_layout\':ignore_layout,\n
+                  \'editable_mode\':editable_mode,\n
+                  \'portal_status_message\':\'Data Updated.\',\n
+                  })\n
+      )\n
   else:\n
-    redirect_url = \'%s/%s?selection_index=%s&selection_name=%s&%s\' % ( context.absolute_url()\n
-                              , form_id\n
-                              , selection_index\n
-                              , selection_name\n
-                              , \'portal_status_message=Data+Updated.\'\n
-                              )\n
-\n
-\n
+    redirect_url = \'%s/%s?%s\' % (\n
+      context.absolute_url(),\n
+      form_id,\n
+      make_query({\'selection_index\':selection_index,\n
+                  \'selection_name\':selection_name,\n
+                  \'ignore_layout\':ignore_layout,\n
+                  \'editable_mode\':editable_mode,\n
+                  \'portal_status_message\':\'Data Updated.\',\n
+                  })\n
+      )\n
 \n
 request[ \'RESPONSE\' ].redirect( redirect_url )\n
-
-
-]]></string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -188,6 +187,8 @@
                             <string>Products.Formulator.Errors</string>
                             <string>ValidationError</string>
                             <string>FormValidationError</string>
+                            <string>ZTUtils</string>
+                            <string>make_query</string>
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>request</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log?rev=17901&r1=17900&r2=17901&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log Thu Nov 29 13:56:15 2007
@@ -1,3 +1,6 @@
+2007-11-29 yusei
+* Fixed Predicate_edit to use ignore_layout and editable_mode parameters in redirect url.
+
 2007-11-19 yusei
 * Switch off acquire_local_roles on Simulation Movement.
 

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=17901&r1=17900&r2=17901&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision Thu Nov 29 13:56:15 2007
@@ -1,1 +1,1 @@
-600
+602