[Erp5-report] r29224 - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Sep 28 15:35:08 2009
New Revision: 29224

URL: http://svn.erp5.org?rev=29224&view=rev
Log:
add '/view' in cancel_url so as to work fine for documents.

Modified:
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml
    erp5/trunk/bt5/erp5_knowledge_pad/bt/revision

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml?rev=29224&r1=29223&r2=29224&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/Base_viewKnowledgePadMacroLibrary.xml [utf8] Mon Sep 28 15:35:08 2009
@@ -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

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml?rev=29224&r1=29223&r2=29224&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad_web/WebSection_viewColumnOne.xml [utf8] Mon Sep 28 15:35:08 2009
@@ -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

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=29224&r1=29223&r2=29224&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Mon Sep 28 15:35:08 2009
@@ -1,1 +1,1 @@
-406
+407