fixed auth.impersonating again, thanks Ricardo

This commit is contained in:
Massimo
2012-10-16 11:08:42 -05:00
parent 67840e9481
commit c13b4f18f7
2 changed files with 6 additions and 5 deletions
+1 -1
View File
@@ -1 +1 @@
Version 2.1.1 (2012-10-16 10:54:30) dev
Version 2.1.1 (2012-10-16 11:08:39) dev
+5 -4
View File
@@ -2746,10 +2746,11 @@ class Auth(object):
callback(form)
log = self.messages.impersonate_log
self.log_event(log,dict(id=current_id, other_id=auth.user.id))
elif user_id in (0, '0') and self.is_impersonating():
session.clear()
session.update(cPickle.loads(auth.impersonator))
self.user = session.auth.user
elif user_id in (0, '0'):
if self.is_impersonating():
session.clear()
session.update(cPickle.loads(auth.impersonator))
self.user = session.auth.user
return None
if requested_id is DEFAULT and not request.post_vars:
return SQLFORM.factory(Field('user_id', 'integer'))