From bd5aa5b5090e29165922e9817e5eff79b83c9fda Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Fri, 14 Jun 2013 16:37:06 +0200
Subject: [PATCH] Fix "came_from" support on login error in website mode.
---
.../portal_skins/erp5_web/WebSite_login.xml | 9 ++++-----
bt5/erp5_web/bt/revision | 2 +-
2 files changed, 5 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 3919e5b226..6a1a06d768 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
@@ -42,17 +42,16 @@
<tal:block tal:condition="here/portal_skins/updateSkinCookie | nothing"\n
tal:define="dummy here/setupCurrentSkin;" />\n
<tal:block tal:define="response request/RESPONSE;\n
- mtool here/portal_membership;\n
- isAnon mtool/isAnonymousUser|nothing;">\n
+ came_from python: request.get(\'came_from\') or request.get(\'field_came_from\');\n
+ isAnon here/portal_membership/isAnonymousUser|nothing;">\n
<tal:block tal:condition="isAnon">\n
<tal:block tal:define="dummy python: response.expireCookie(\'__ac\', path=\'/\');\n
url python: \'%s?portal_status_message=%s\' % (here.absolute_url(), here.Base_translateString(\'Login and/or password is incorrect.\'));\n
- url python: request.get(\'came_from\') and \'%s&came_from=%s\' % (url, request[\'came_from\']) or url;\n
+ url python: came_from and \'%s&came_from=%s\' % (url, came_from) or url;\n
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 request.get(\'field_came_from\') or here.getPermanentURL(here);\n
- dummy python: response.redirect(came_from);" />\n
+ <tal:block tal:define="dummy python: response.redirect(came_from or here.getPermanentURL(here));" />\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision
index 5b2b55035c..4f1e6aa1b1 100644
--- a/bt5/erp5_web/bt/revision
+++ b/bt5/erp5_web/bt/revision
@@ -1 +1 @@
-1100
\ No newline at end of file
+1101
--
2.30.9