[Erp5-report] r10494 - /erp5/trunk/products/ERP5/Tool/TemplateTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Oct  2 19:41:33 2006
New Revision: 10494

URL: http://svn.erp5.org?rev=10494&view=rev
Log:
Porpagate the cancel url so that calling this method from a dialog doesn't break the cancel button. Make it optionnal to avoid breaking all existing sites...

Modified:
    erp5/trunk/products/ERP5/Tool/TemplateTool.py

Modified: erp5/trunk/products/ERP5/Tool/TemplateTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/TemplateTool.py?rev=10494&r1=10493&r2=10494&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/TemplateTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/TemplateTool.py Mon Oct  2 19:41:33 2006
@@ -531,8 +531,8 @@
       if REQUEST is not None:
         ret_url = self.absolute_url() + '/' + REQUEST.get('dialog_id', 'view')
         psm = N_("Business+Templates+Updated+Successfully")
-        REQUEST.RESPONSE.redirect("%s?portal_status_message=%s&dialog_category=object_exchange&selection_name=business_template_selection"
-                                  % (ret_url, psm))
+        REQUEST.RESPONSE.redirect("%s?cancel_url=%s&portal_status_message=%s&dialog_category=object_exchange&selection_name=business_template_selection"
+                                  % (ret_url, REQUEST.form.get('cancel_url', ''), psm))
                 
     security.declareProtected( Permissions.AccessContentsInformation,
                                'getRepositoryList' )