odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] base_action_rule: removed wrong default context (it should not be the one used to create/modify the rule). 

Also renamed pre_action in post_action since it is done after the create or write.
Removed misleading variable to capture write() return value.

bzr revid: vmt@openerp.com-20111114113915-0783vjb7f2jmznj7
This commit is contained in:
Vo Minh Thu 2011-11-14 12:39:15 +01:00
parent 238cd085bb
commit 753e0f26d3
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
addons/base_action_rule/base_action_rule.py
View File

@ -147,7 +147,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
res['value'] = {'filter_id':False}
return res
def pre_action(self, cr, uid, ids, model, context=None):
def post_action(self, cr, uid, ids, model, context=None):
# Searching for action rules
cr.execute("SELECT model.model, rule.id FROM base_action_rule rule \
LEFT JOIN ir_model model on (model.id = rule.model_id) \
@ -156,7 +156,7 @@ the rule to mark CC(mail to any other person defined in actions)."),
# Check if any rule matching with current object
for obj_name, rule_id in res:
if not (model == obj_name):
continue
continue # TODO add this condition in the WHERE clause above.
else:
obj = self.pool.get(obj_name)
# If the rule doesn't involve a time condition, run it immediately
@ -166,30 +166,36 @@ the rule to mark CC(mail to any other person defined in actions)."),
return True
def _create(self, old_create, model, context=None):
if context is None:
context = {}
def make_call_old(cr, uid, vals, context=context):
"""
Return a wrapper around `old_create` calling both `old_create` and
`post_action`, in that order.
"""
def wrapper(cr, uid, vals, context=context):
new_id = old_create(cr, uid, vals, context=context)
if not context.get('action'):
self.pre_action(cr, uid, [new_id], model, context=context)
self.post_action(cr, uid, [new_id], model, context=context)
return new_id
return make_call_old
return wrapper
def _write(self, old_write, model, context=None):
def make_call_old(cr, uid, ids, vals, context=context):
if context is None:
context = {}
"""
Return a wrapper around `old_write` calling both `old_write` and
`post_action`, in that order.
"""
def wrapper(cr, uid, ids, vals, context=context):
if isinstance(ids, (str, int, long)):
ids = [ids]
change_id = old_write(cr, uid, ids, vals, context=context)
old_write(cr, uid, ids, vals, context=context)
if not context.get('action'):
self.pre_action(cr, uid, ids, model, context=context)
return change_id
return make_call_old
self.post_action(cr, uid, ids, model, context=context)
return True
return wrapper
def _register_hook(self, cr, uid, ids, context=None):
if context is None:
context = {}
"""
Wrap every `create` and `write` methods of the models specified by
the rules (given by `ids`).
"""
for action_rule in self.browse(cr, uid, ids, context=context):
model = action_rule.model_id.model
obj_pool = self.pool.get(model)
@ -199,15 +205,16 @@ the rule to mark CC(mail to any other person defined in actions)."),
obj_pool.base_action_ruled = True
return True
def create(self, cr, uid, vals, context=None):
res_id = super(base_action_rule, self).create(cr, uid, vals, context=context)
self._register_hook(cr, uid, [res_id], context=context)
return res_id
def write(self, cr, uid, ids, vals, context=None):
res = super(base_action_rule, self).write(cr, uid, ids, vals, context=context)
super(base_action_rule, self).write(cr, uid, ids, vals, context=context)
self._register_hook(cr, uid, ids, context=context)
return res
return True
def _check(self, cr, uid, automatic=False, use_new_cursor=False, \
context=None):