diff options
| author | Xavier ALT <xal@openerp.com> | 2012-03-23 15:25:41 +0100 |
|---|---|---|
| committer | Xavier ALT <xal@openerp.com> | 2012-03-23 15:25:41 +0100 |
| commit | b5beb3dbe039ef00a5d0b9a968c88e79155165d1 (patch) | |
| tree | 720fb3dcbabdafdb58882035ffd4ea09464a1a53 | |
| parent | c3229cb8ceecc53ad73b01fceb6b2f996cf9025e (diff) | |
| parent | d316afbdafe5492c6f16ac691a8fdabf83d80694 (diff) | |
[MERGE] OPW 573037: audittrail: force admin for subscribe/unsubscribe op - fix 'admin/access rights' members access
bzr revid: xal@openerp.com-20120323142541-ebxn935mdfk7bk9s
| -rw-r--r-- | addons/audittrail/audittrail.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py index 302d6e146bd..c25fb6c01f4 100644 --- a/addons/audittrail/audittrail.py +++ b/addons/audittrail/audittrail.py @@ -82,11 +82,11 @@ class audittrail_rule(osv.osv): "domain": "[('object_id','=', " + str(thisrule.object_id.id) + "), ('res_id', '=', active_id)]" } - action_id = obj_action.create(cr, uid, val) + action_id = obj_action.create(cr, 1, val) self.write(cr, uid, [thisrule.id], {"state": "subscribed", "action_id": action_id}) keyword = 'client_action_relate' value = 'ir.actions.act_window,' + str(action_id) - res = obj_model.ir_set(cr, uid, 'action', keyword, 'View_log_' + thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False) + res = obj_model.ir_set(cr, 1, 'action', keyword, 'View_log_' + thisrule.object_id.model, [thisrule.object_id.model], value, replace=True, isobject=True, xml_id=False) #End Loop return True @@ -108,7 +108,7 @@ class audittrail_rule(osv.osv): setattr(function[0], function[1], function[2]) w_id = obj_action.search(cr, uid, [('name', '=', 'View Log'), ('res_model', '=', 'audittrail.log'), ('src_model', '=', thisrule.object_id.model)]) if w_id: - obj_action.unlink(cr, uid, w_id) + obj_action.unlink(cr, 1, w_id) value = "ir.actions.act_window" + ',' + str(w_id[0]) val_id = ir_values_obj.search(cr, uid, [('model', '=', thisrule.object_id.model), ('value', '=', value)]) if val_id: |