From 167ac3fc9e81cf8d462d6fe970a5866aea7565f4 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Tue, 3 Apr 2007 13:38:24 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13894 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_xhtml_style/global_definitions.xml | 4 ++-- product/ERP5/bootstrap/erp5_xhtml_style/bt/revision | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml index 583861842c..cb1deb00d1 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml @@ -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 diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision index b0e9f8d0ff..755152b7ef 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision +++ b/product/ERP5/bootstrap/erp5_xhtml_style/bt/revision @@ -1 +1 @@ -358 \ No newline at end of file +359 \ No newline at end of file -- 2.30.9