From c59406e2ce0914a494743969fa1ea18e4812539e Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Mon, 28 Sep 2009 13:35:08 +0000 Subject: [PATCH] add '/view' in cancel_url so as to work fine for documents. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@29224 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml | 4 ++-- .../erp5_knowledge_pad_web/WebSection_viewColumnOne.xml | 2 +- bt5/erp5_knowledge_pad/bt/revision | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml index 5824eaa9c9..51471a0714 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml @@ -70,8 +70,8 @@ tal:define="real_here python: request.get(\'current_web_section\', here);\n real_here python: test(real_here.getPortalType()!=\'Web Site\', real_here, here);"\n tal:attributes="href python:\n - \'GadgetTool_viewPrettyGadgetDialog?reset=1&cancel_url=%s/view&active_pad_relative_url=%s&mode=%s\'\n - %(real_here.absolute_url(), \n + \'GadgetTool_viewPrettyGadgetDialog?reset=1&cancel_url=%s&active_pad_relative_url=%s&mode=%s\'\n + %(cancel_url, \n active_knowledge_pad.getRelativeUrl(), mode);"\n title="Click to add portlets"\n i18n:translate="" \n diff --git a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml index 2fa264c0d4..1f169c2261 100644 --- a/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml +++ b/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml @@ -75,7 +75,7 @@ context/Base_isUserAllowedToUseKnowledgePad;\n isKnowledgePadTemplateUsed python:\n request.get(\'is_knowledge_pad_template_used\', 0);\n - cancel_url current_web_section_url;">\n + cancel_url string:${current_web_section_url}/view">\n \n <tal:block tal:condition="python: not createDefaultPadForUser and \n not waitForActivitiesOnServer and\n diff --git a/bt5/erp5_knowledge_pad/bt/revision b/bt5/erp5_knowledge_pad/bt/revision index 7b89b2202c..009bd2c17f 100644 --- a/bt5/erp5_knowledge_pad/bt/revision +++ b/bt5/erp5_knowledge_pad/bt/revision @@ -1 +1 @@ -406 \ No newline at end of file +407 \ No newline at end of file -- 2.30.9