[Erp5-report] r19907 - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTemplat...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Mar 14 15:14:30 2008
New Revision: 19907

URL: http://svn.erp5.org?rev=19907&view=rev
Log:
Pass form_id when redirecting to dialog action

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_redirectToDialogAction.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_redirectToDialogAction.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_redirectToDialogAction.xml?rev=19907&r1=19906&r2=19907&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_redirectToDialogAction.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_redirectToDialogAction.xml Fri Mar 14 15:14:30 2008
@@ -65,8 +65,17 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return container.REQUEST.RESPONSE.redirect(dialog_action_url)\n
-</string> </value>
+            <value> <string encoding="cdata"><![CDATA[
+
+if \'?\' in dialog_action_url:\n
+  dialog_action_url = \'%s&form_id=%s\' % (dialog_action_url, form_id)\n
+else:\n
+  dialog_action_url = \'%s?form_id=%s\' % (dialog_action_url, form_id)\n
+\n
+return container.REQUEST.RESPONSE.redirect(dialog_action_url)\n
+
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -88,7 +97,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>dialog_action_url</string> </value>
+            <value> <string>dialog_action_url, form_id=\'\'</string> </value>
         </item>
         <item>
             <key> <string>errors</string> </key>
@@ -108,13 +117,14 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>1</int> </value>
+                        <value> <int>2</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
                             <string>dialog_action_url</string>
+                            <string>form_id</string>
                             <string>_getattr_</string>
                             <string>container</string>
                           </tuple>
@@ -128,7 +138,9 @@
         <item>
             <key> <string>func_defaults</string> </key>
             <value>
-              <none/>
+              <tuple>
+                <string></string>
+              </tuple>
             </value>
         </item>
         <item>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=19907&r1=19906&r2=19907&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Fri Mar 14 15:14:30 2008
@@ -1,1 +1,1 @@
-505
+506