From a3857167fdcfddd185a2b2f5acece04f829c06ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 6 Mar 2013 13:32:16 +0100 Subject: [PATCH] Don't use Model from res module in ir module As ir module doesn't depend on res module, it should not use the Model of it. --- trytond/ir/model.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/trytond/ir/model.py b/trytond/ir/model.py index 8c0eb27cf3..21f3b294fc 100644 --- a/trytond/ir/model.py +++ b/trytond/ir/model.py @@ -501,7 +501,6 @@ class ModelFieldAccess(ModelSQL, ModelView): pool = Pool() Model = pool.get('ir.model') ModelField = pool.get('ir.model.field') - UserGroup = pool.get('res.user-res.group') cursor = Transaction().cursor user = Transaction().user @@ -528,14 +527,13 @@ class ModelFieldAccess(ModelSQL, ModelView): 'ON (a.field = f.id) ' 'JOIN "%s" AS m ' 'ON (f.model = m.id) ' - 'LEFT JOIN "%s" AS gu ' + 'LEFT JOIN "res_user-res_group" AS gu ' 'ON (gu."group" = a."group") ' 'WHERE m.model IN (' + ','.join(('%%s',) * len(models)) + ') ' 'AND (gu."user" = %%s OR a."group" IS NULL) ' 'GROUP BY m.model, f.name') - % (cls._table, ModelField._table, - Model._table, UserGroup._table), - list(models) + [Transaction().user]) + % (cls._table, ModelField._table, Model._table), + list(models) + [Transaction().user]) for m, f, r, w, c, d in cursor.fetchall(): accesses[m][f] = {'read': r, 'write': w, 'create': c, 'delete': d} for model, maccesses in accesses.iteritems():