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

[REF] auth_ldap: removed openerp.pooler imports. 

bzr revid: vmt@openerp.com-20130327115733-0hsqtwasjgcnu28x
This commit is contained in:
Vo Minh Thu 2013-03-27 12:57:33 +01:00
parent 3659a34d27
commit 4acfd6ae82
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
addons/auth_ldap/users_ldap.py
View File

@ -23,7 +23,6 @@ import logging
from ldap.filter import filter_format
import openerp.exceptions
from openerp import pooler
from openerp import tools
from openerp.osv import fields, osv
from openerp import SUPERUSER_ID
@ -188,7 +187,7 @@ class CompanyLDAP(osv.osv):
user_id = res[0]
elif conf['create_user']:
_logger.debug("Creating new OpenERP user \"%s\" from LDAP" % login)
user_obj = self.pool.get('res.users')
user_obj = self.pool['res.users']
values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
if conf['user']:
user_id = user_obj.copy(cr, SUPERUSER_ID, conf['user'],
@ -246,8 +245,8 @@ class users(osv.osv):
user_id = super(users, self).login(db, login, password)
if user_id:
return user_id
cr = pooler.get_db(db).cursor()
ldap_obj = pooler.get_pool(db).get('res.company.ldap')
cr = self.pool.db.cursor()
ldap_obj = self.pool['res.company.ldap']
for conf in ldap_obj.get_ldap_dicts(cr):
entry = ldap_obj.authenticate(conf, login, password)
if entry:
@ -269,12 +268,12 @@ class users(osv.osv):
except openerp.exceptions.AccessDenied:
pass
cr = pooler.get_db(db).cursor()
cr = self.pool.db.cursor()
cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE',
(int(uid),))
res = cr.fetchone()
if res:
ldap_obj = pooler.get_pool(db).get('res.company.ldap')
ldap_obj = self.pool['res.company.ldap']
for conf in ldap_obj.get_ldap_dicts(cr):
if ldap_obj.authenticate(conf, res[0], passwd):
self._uid_cache.setdefault(db, {})[uid] = passwd