From 4ddabb8dc0f7aca4146f7f69656937cd54d990e7 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Wed, 5 Dec 2007 09:51:36 +0000 Subject: [PATCH] Fix WebSite_login (duplicate implementation from logged_in) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18019 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_web/WebSite_login.xml | 34 +++++++++++-------- bt5/erp5_web/bt/revision | 2 +- 2 files changed, 21 insertions(+), 15 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 846f061413..368c0b5ba5 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 @@ -54,21 +54,27 @@ <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ -<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 - <tal:block tal:condition="isAnon">\n - <tal:block tal:define="dummy python: response.expireCookie(\'__ac\', path=\'/\');\n - url python: \'%s?came_from=%s&portal_status_message=%s\' % (request[\'came_from\'], request[\'came_from\'], here.getPortalObject().Localizer.translate(\'ui\', \'Sorry,+the+email+adress and/or+the+password+that+you+provided+are+incorrect.\'));\n - dummy python: response.redirect(url);"/>\n +<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n + xmlns:metal="http://xml.zope.org/namespaces/metal"\n + xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n + <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 + <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.getPortalObject().Localizer.translate(\'ui\', \'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 + 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 + dummy python: response.redirect(came_from);" />\n + </tal:block>\n </tal:block>\n - <tal:block tal:condition="not: isAnon">\n - <tal:block tal:define="came_from python: \'%s\' % request.get(\'came_from\') or here.portal_url() + \'/view\';\n - dummy python: response.redirect(came_from);" />\n - </tal:block>\n -</tal:block> +</tal:block>\n + ]]></string> </value> </item> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 5aac26524c..a9ba1259cf 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -606 \ No newline at end of file +607 \ No newline at end of file -- 2.30.9