pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website: signin and logout redirect url

Browse Source 
bzr revid: chm@openerp.com-20131203173146-7om0xl9b7ubb5cqc
This commit is contained in:
Christophe Matthieu
2013-12-03 18:31:46 +01:00
parent 63a9616138
commit 704607db5a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/models/website.py
+4
View File
@@ -77,6 +77,9 @@ def urlplus(url, params):
for k, v in params.iteritems()
))
def quote_plus(value):
return urllib.quote_plus(value.encode('utf-8') if isinstance(value, unicode) else str(value))
class website(osv.osv):
def _get_menu_website(self, cr, uid, ids, context=None):
# IF a menu is changed, update all websites
@@ -226,6 +229,7 @@ class website(osv.osv):
slug=slug,
res_company=request.website.company_id,
user_id=user.browse(cr, uid, uid),
quote_plus=quote_plus,
)
context.update(
addons/website/views/website_templates.xml
+2 -2
View File
@@ -138,7 +138,7 @@
<ul class="dropdown-menu js_usermenu" role="menu">
<li><a href="/web" role="menuitem">Administration</a></li>
<li class="divider"/>
<li><a t-attf-href="/web/session/logout?redirect=#{ url_for('') }" role="menuitem">Logout</a></li>
<li><a t-attf-href="/web/session/logout?redirect=#{ quote_plus(url_for('', keep_query='*')) }" role="menuitem">Logout</a></li>
</ul>
</li>
</ul>
@@ -227,7 +227,7 @@
<template id="show_sign_in" inherit_option_id="website.layout" inherit_id="website.layout" name="Show Sign In">
<xpath expr="//ul[@id='top_menu']" position="inside">
<li t-if="user_id.id == website.public_user.id">
<a t-attf-href="/web#redirect=#{ url_for('') }">
<a t-attf-href="/web#redirect=#{ quote_plus(url_for('', keep_query='*')) }">
<span class="badge">Sign in</span>
</a>
</li>