merge trunk

bzr revid: nicolas.vanhoren@openerp.com-20131018134553-a7dshmtv8yp70qzp
This commit is contained in:
niv-openerp
2013-10-18 15:45:53 +02:00
parent c333546c35
commit ec291efb80
+2
View File
@@ -189,6 +189,8 @@ class WebRequest(object):
def auth_method_user():
request.uid = request.session.uid
if not request.uid:
raise SessionExpiredException("Session expired")
def auth_method_admin():
if not request.db: