[Erp5-report] r18019 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web/...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Dec 5 10:51:37 CET 2007
Author: romain
Date: Wed Dec 5 10:51:36 2007
New Revision: 18019
URL: http://svn.erp5.org?rev=18019&view=rev
Log:
Fix WebSite_login (duplicate implementation from logged_in)
Modified:
erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
erp5/trunk/bt5/erp5_web/bt/revision
Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml?rev=18019&r1=18018&r2=18019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml Wed Dec 5 10:51:36 2007
@@ -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>
Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=18019&r1=18018&r2=18019&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Wed Dec 5 10:51:36 2007
@@ -1,1 +1,1 @@
-606
+607
More information about the Erp5-report
mailing list