pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*bugfix 1: there were too many arguments (uid was twice) removed one

Browse Source 
*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
This commit is contained in:
qdp
2008-06-19 08:53:24 +00:00
parent 17c4695ed7
commit f49da35cab
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/ir/ir_rule.py
+2 -2
View File
@@ -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 '', []