[Erp5-report] r34519 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Skin...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Apr 13 17:01:12 2010
New Revision: 34519

URL: http://svn.erp5.org?rev=34519&view=rev
Log:
Sometime the cancel_url already contains selection_name/selection_index, in that case we should not use ERP5Site_redirect that would add it again

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_cancel.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_cancel.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_cancel.xml?rev=34519&r1=34518&r2=34519&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_cancel.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_cancel.xml [utf8] Tue Apr 13 17:01:12 2010
@@ -53,8 +53,16 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return context.ERP5Site_redirect(cancel_url, **kw)\n
-</string> </value>
+            <value> <string encoding="cdata"><![CDATA[
+
+if \'?selection_name=\' in cancel_url or \'&selection_name=\' in cancel_url:\n
+  # if selection_name is already present in the cancel URL, we do not\n
+  # use erp5_xhtml_style script that would add it again.\n
+  return context.REQUEST.RESPONSE.redirect(cancel_url)\n
+return context.ERP5Site_redirect(cancel_url, **kw)\n
+
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -92,9 +100,9 @@
                           <tuple>
                             <string>cancel_url</string>
                             <string>kw</string>
-                            <string>_apply_</string>
                             <string>_getattr_</string>
                             <string>context</string>
+                            <string>_apply_</string>
                           </tuple>
                         </value>
                     </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=34519&r1=34518&r2=34519&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Tue Apr 13 17:01:12 2010
@@ -1,1 +1,1 @@
-926
+927