[Erp5-report] r26607 - /erp5/trunk/products/ERP5Form/SelectionTool.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Apr 23 13:11:21 2009
New Revision: 26607

URL: http://svn.erp5.org?rev=26607&view=rev
Log:
remove ignore_layout parameter from cancel_url otherwise we will have
two ignore_layout parameters after clicking cancel button.

Modified:
    erp5/trunk/products/ERP5Form/SelectionTool.py

Modified: erp5/trunk/products/ERP5Form/SelectionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/SelectionTool.py?rev=26607&r1=26606&r2=26607&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/SelectionTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/SelectionTool.py [utf8] Thu Apr 23 13:11:21 2009
@@ -40,7 +40,7 @@
 from Selection import Selection, DomainSelection
 from ZPublisher.HTTPRequest import FileUpload
 import md5
-import string
+import string, re
 from zLOG import LOG, INFO
 from Acquisition import aq_base
 from Products.ERP5Type.Message import translateString
@@ -1155,12 +1155,17 @@
             kw[k] = v
         kw['reset'] = 0
         kw['base_category'] = field.get_value( 'base_category')
-        kw['cancel_url'] = REQUEST.get('HTTP_REFERER')
         kw['form_id'] = form_id
         kw[field.get_value('catalog_index')] = field_value
         kw['portal_status_message'] = portal_status_message
         kw['saved_form_data'] = saved_form_data
         kw['ignore_layout'] = int(REQUEST.get('ignore_layout', 0))
+        # remove ignore_layout parameter from cancel_url otherwise we
+        # will have two ignore_layout parameters after clicking cancel
+        # button.
+        kw['cancel_url'] = '&'.join([x for x in \
+                                     REQUEST.get('HTTP_REFERER').split('&') \
+                                     if not re.match('^ignore_layout[:=]', x)])
 
         proxy_listbox_ids = field.get_value('proxy_listbox_ids')
         REQUEST.set('proxy_listbox_ids', proxy_listbox_ids)