From 74711589ee6b72da00f966a75ae6a08601ba2fe9 Mon Sep 17 00:00:00 2001 From: Jean-Paul Smets <jp@nexedi.com> Date: Sat, 5 Apr 2008 10:05:47 +0000 Subject: [PATCH] Give one more chance to find the came_from whenever we come from a dialog with input button and no validation. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20314 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_web/WebSite_login.xml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml index 368c0b5ba5..9a630e6578 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml @@ -3,11 +3,8 @@ <record id="1" aka="AAAAAAAAAAE="> <pickle> <tuple> - <tuple> - <string>Products.PageTemplates.ZopePageTemplate</string> - <string>ZopePageTemplate</string> - </tuple> - <none/> + <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/> + <tuple/> </tuple> </pickle> <pickle> @@ -69,7 +66,7 @@ dummy python: response.redirect(url);" />\n </tal:block>\n <tal:block tal:condition="not: isAnon">\n - <tal:block tal:define="came_from python: request.get(\'came_from\') or here.absolute_url() + \'/view\';\n + <tal:block tal:define="came_from python: request.get(\'came_from\') or request.get(\'field_came_from\') or here.absolute_url() + \'/view\';\n dummy python: response.redirect(came_from);" />\n </tal:block>\n </tal:block>\n -- 2.30.9