Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
erp5
Commits
bd5aa5b5
Commit
bd5aa5b5
authored
Jun 14, 2013
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix "came_from" support on login error in website mode.
parent
4a549808
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
.../SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
+4
-5
bt5/erp5_web/bt/revision
bt5/erp5_web/bt/revision
+1
-1
No files found.
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml
View file @
bd5aa5b5
...
@@ -42,17 +42,16 @@
...
@@ -42,17 +42,16 @@
<tal:block
tal:condition=
"here/portal_skins/updateSkinCookie | nothing"
\n
<tal:block
tal:condition=
"here/portal_skins/updateSkinCookie | nothing"
\n
tal:define=
"dummy here/setupCurrentSkin;"
/>
\n
tal:define=
"dummy here/setupCurrentSkin;"
/>
\n
<tal:block
tal:define=
"response request/RESPONSE;\n
<tal:block
tal:define=
"response request/RESPONSE;\n
mtool here/portal_membership
;\n
came_from python: request.get(\'came_from\') or request.get(\'field_came_from\')
;\n
isAnon
mtool
/isAnonymousUser|nothing;"
>
\n
isAnon
here/portal_membership
/isAnonymousUser|nothing;"
>
\n
<tal:block
tal:condition=
"isAnon"
>
\n
<tal:block
tal:condition=
"isAnon"
>
\n
<tal:block
tal:define=
"dummy python: response.expireCookie(\'__ac\', path=\'/\');\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: \'%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
dummy python: response.redirect(url);"
/>
\n
</tal:block>
\n
</tal:block>
\n
<tal:block
tal:condition=
"not: isAnon"
>
\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
<tal:block
tal:define=
"dummy python: response.redirect(came_from or here.getPermanentURL(here));"
/>
\n
dummy python: response.redirect(came_from);"
/>
\n
</tal:block>
\n
</tal:block>
\n
</tal:block>
\n
</tal:block>
\n
</tal:block>
\n
</tal:block>
\n
...
...
bt5/erp5_web/bt/revision
View file @
bd5aa5b5
1100
1101
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment