odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

merge 

bzr revid: fp@tinyerp.com-20100211070849-44l42nwos1sjnah0
This commit is contained in:
Fabien Pinckaers 2010-02-11 08:08:49 +01:00
parent 0a5f82bd3b
commit 8b880cbf01
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/addons/base/res/res_user.py
View File

@ -299,7 +299,7 @@ class users(osv.osv):
res = getattr(user,k) or False
if isinstance(res, browse_record):
res = res.id
result[k[8:]] = res
result[k[8:]] = res or False
return result
def action_get(self, cr, uid, context={}):

5
bin/service/security.py
View File

@ -30,9 +30,12 @@ class ExceptionNoTb(Exception):
self.args = (msg, '')
def login(db, login, password):
print 'login'
pool = pooler.get_pool(db)
user_obj = pool.get('res.users')
return user_obj.login(db, login, password)
res = user_obj.login(db, login, password)
print 'login end'
return res
def check_super(passwd):
if passwd == tools.config['admin_passwd']: