Odoo Addons (MOVED TO GITHUB)

Merge lp:~akretion-team/openobject-addons/trunk-addons-active-on-acl-rules-v3 into lp:openobject-addons

  1. trunk-addons-active-on-acl-rules-v3
  2. Merge into trunk
Proposed by Alexis de Lattre
Status: Merged
Merged at revision: 7628
Proposed branch: lp:~akretion-team/openobject-addons/trunk-addons-active-on-acl-rules-v3
Merge into: lp:openobject-addons
Diff against target: 11 lines (+1/-0)
1 file modified
share/ir_model.py (+1/-0)
To merge this branch: bzr merge lp:~akretion-team/openobject-addons/trunk-addons-active-on-acl-rules-v3
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+114983@code.launchpad.net

Description of the change

This merge proposal is the continuity of this other merge proposal on the server to add an "active" field on ir.model.access and ir.rule :

https://code.launchpad.net/~akretion-team/openobject-server/trunk-server-active-on-acl-rules-v3/+merge/114982

To post a comment you must log in.
Revision history for this message
Fabien (Open ERP) (fp-tinyerp) wrote :

merged in trunk r7628
thanks for the contribution

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/ir_model.py'
2--- share/ir_model.py 2012-06-15 15:36:07 +0000
3+++ share/ir_model.py 2012-07-14 12:33:19 +0000
4@@ -40,6 +40,7 @@
5 LEFT JOIN ir_module_category c ON (c.id=g.category_id)
6 WHERE
7 m.model=%s AND
8+ a.active IS true AND
9 (g.share IS NULL or g.share IS false) AND
10 a.perm_''' + access_mode, (model_name,))
11 return [('%s/%s' % x) if x[0] else x[1] for x in cr.fetchall()]

Subscribers

People subscribed via source and target branches

to all changes: