From f49da35cabf28785be0d0da9ab1c3c28d2bca7f4 Mon Sep 17 00:00:00 2001 From: qdp <> Date: Thu, 19 Jun 2008 08:53:24 +0000 Subject: [PATCH] *bugfix 1: there were too many arguments (uid was twice) removed one *bugfix 2: simple quotes were missing diff: Index: 4.2/server/bin/addons/base/ir/ir_rule.py =================================================================== --- 4.2/server/bin/addons/base/ir/ir_rule.py (revision 8632) +++ 4.2/server/bin/addons/base/ir/ir_rule.py (working copy) @@ -152,10 +152,10 @@ JOIN (ir_rule_group g JOIN ir_model m ON (g.model_id = m.id)) ON (g.id = r.rule_group) - WHERE m.model = %s + WHERE m.model = '%s' AND (g.id IN (SELECT rule_group_id FROM group_rule_group_rel g_rel JOIN res_groups_users_rel u_rel ON (g_rel.group_id = u_rel.gid) - WHERE u_rel.uid = %d) OR g.global)""", (model_name, uid, uid)) + WHERE u_rel.uid = %d) OR g.global)""", (model_name, uid)) bzr revid: qdp-ea1786beea6e242a9927c8f66323acb27a6b0755 --- bin/addons/base/ir/ir_rule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/ir/ir_rule.py b/bin/addons/base/ir/ir_rule.py index d3178616435..b2e0a4b18f0 100644 --- a/bin/addons/base/ir/ir_rule.py +++ b/bin/addons/base/ir/ir_rule.py @@ -152,10 +152,10 @@ class ir_rule(osv.osv): JOIN (ir_rule_group g JOIN ir_model m ON (g.model_id = m.id)) ON (g.id = r.rule_group) - WHERE m.model = %s + WHERE m.model = '%s' AND (g.id IN (SELECT rule_group_id FROM group_rule_group_rel g_rel JOIN res_groups_users_rel u_rel ON (g_rel.group_id = u_rel.gid) - WHERE u_rel.uid = %d) OR g.global)""", (model_name, uid, uid)) + WHERE u_rel.uid = %d) OR g.global)""", (model_name, uid)) ids = map(lambda x:x[0], cr.fetchall()) if not ids: return '', []