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

[nobody at svn.erp5.org]

Author: vincent
Date: Tue Apr  3 15:38:24 2007
New Revision: 13894

URL: http://svn.erp5.org?rev=13894&view=rev
Log:
Do not use request/ACTUAL_URL as default cancel_url value, because (for example) list mode urls are sometime method names, which makes the cancel url useless.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.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/global_definitions.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml?rev=13894&r1=13893&r2=13894&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml Tue Apr  3 15:38:24 2007
@@ -57,9 +57,7 @@
 <tal:block metal:define-macro="header_definitions">\n
   <tal:block tal:define="\n
     global portal_path         here/portal_url/getPortalPath;\n
-           cancel_url            request/cancel_url | request/ACTUAL_URL;\n
            local_parameter_list  local_parameter_list | python: {};\n
-           dummy                 python: local_parameter_list.update({\'cancel_url\': cancel_url});\n
 \n
     global actions          python: here.getPortalObject().portal_actions.listFilteredActionsFor(here);\n
     global url              here/absolute_url;\n
@@ -67,6 +65,8 @@
            dummy            python: request.set(\'current_form_id\', current_form_id);\n
     global current_url      python: \'%s/%s\' % (url, current_form_id);\n
     global current_action   python: here.ERP5Site_getCurrentAction(current_url, actions);\n
+           cancel_url       request/cancel_url | current_url;\n
+           dummy            python: local_parameter_list.update({\'cancel_url\': cancel_url});\n
 \n
            dummy       python: request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\');\n
            dummy  python: request.set(\'here\', here);\n

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=13894&r1=13893&r2=13894&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision Tue Apr  3 15:38:24 2007
@@ -1,1 +1,1 @@
-358
+359