Skip to content

[FIX] use a nonserialized cursor for updating user groups #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StefanRijnhart merged 4 commits into from
Oct 30, 2015
Merged

[FIX] use a nonserialized cursor for updating user groups #250

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b00fad
[FIX] use a nonserialized cursor for updating user groups
hbrunn Sep 8, 2015
3f2e12d
[FIX] actually use a nonserialized cursor
hbrunn Sep 8, 2015
cf9509c
[FIX] update groups with sql
hbrunn Sep 8, 2015
3db7523
[FIX] don't do anything for admin
hbrunn Sep 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions auth_dynamic_groups/model/res_users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#
##############################################################################
from openerp.models import Model
from openerp.modules.registry import RegistryManager
from openerp import SUPERUSER_ID


Expand All @@ -29,27 +28,28 @@ class res_users(Model):
def _login(self, db, login, password):
uid = super(res_users, self)._login(db, login, password)

if uid:
if uid and uid != SUPERUSER_ID:
self.update_dynamic_groups(uid, db)

return uid

def update_dynamic_groups(self, uid, db):
pool = RegistryManager.get(db)
cr = pool._db.cursor()
user = pool.get('res.users').browse(cr, SUPERUSER_ID, uid)
groups_obj = pool.get('res.groups')
user.write(
{
'groups_id': [
(4, dynamic_group.id)
if dynamic_group.eval_dynamic_group_condition(uid=uid)
else (3, dynamic_group.id)
for dynamic_group in groups_obj.browse(
cr, SUPERUSER_ID,
groups_obj.search(cr, SUPERUSER_ID,
[('is_dynamic', '=', True)]))
],
})
cr.commit()
cr.close()
cr = self.pool._db.cursor(serialized=False)
groups_obj = self.pool.get('res.groups')
try:
dynamic_groups = groups_obj.browse(
cr, SUPERUSER_ID, groups_obj.search(
cr, SUPERUSER_ID, [('is_dynamic', '=', True)]))
cr.execute(
'delete from res_groups_users_rel where uid=%s and gid in %s',
(uid, tuple(dynamic_groups.ids)))
for dynamic_group in dynamic_groups:
if dynamic_group.eval_dynamic_group_condition(uid=uid):
cr.execute(
'insert into res_groups_users_rel (uid, gid) values '
'(%s, %s)',
(uid, dynamic_group.id))
self.invalidate_cache(cr, uid, ['groups_id'], [uid])
cr.commit()
finally:
cr.close()