summaryrefslogtreecommitdiff
path: root/openerp/workflow
diff options
context:
space:
mode:
authorRaphael Collet <rco@openerp.com>2016-08-11 13:22:31 +0200
committerRaphael Collet <rco@openerp.com>2016-08-31 17:21:55 +0200
commit72afd2823077fffc027ee6da692b8f8a89dfc794 (patch)
tree9ddf392a193e924182263b221b53a4bac9de0fc6 /openerp/workflow
parent16696b2a05529a7cd3d4b9e20ee89a575f3cd9e2 (diff)
[FIX] remove or convert old-API calls
Diffstat (limited to 'openerp/workflow')
-rw-r--r--openerp/workflow/workitem.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/openerp/workflow/workitem.py b/openerp/workflow/workitem.py
index a2f20195f9b..8affdd7a8a1 100644
--- a/openerp/workflow/workitem.py
+++ b/openerp/workflow/workitem.py
@@ -32,10 +32,10 @@ class Environment(dict):
self.model = record.model
self.id = record.id
self.ids = [record.id]
- self.obj = openerp.registry(self.cr.dbname)[self.model]
def __getitem__(self, key):
- records = self.obj.browse(self.cr, self.uid, self.ids)
+ env = openerp.api.Environment(self.cr, self.uid, {})
+ records = env[self.model].browse(self.ids)
if hasattr(records, key):
return getattr(records, key)
else:
@@ -282,10 +282,9 @@ class WorkflowItem(object):
'active_id': self.record.id,
'active_ids': [self.record.id]
}
-
- ir_actions_server = openerp.registry(self.session.cr.dbname)['ir.actions.server']
- result = ir_actions_server.run(self.session.cr, self.session.uid, [activity['action_id']], context)
-
+ env = openerp.api.Environment(self.session.cr, self.session.uid, context)
+ action = env['ir.actions.server'].browse(activity['action_id'])
+ result = action.run()
return result
def wkf_expr_execute(self, activity):
@@ -307,9 +306,9 @@ class WorkflowItem(object):
return False
if self.session.uid != openerp.SUPERUSER_ID and transition['group_id']:
- registry = openerp.registry(self.session.cr.dbname)
- user_groups = registry['res.users'].read(self.session.cr, self.session.uid, [self.session.uid], ['groups_id'])[0]['groups_id']
- if transition['group_id'] not in user_groups:
+ env = openerp.api.Environment(self.session.cr, self.session.uid, {})
+ user_groups = env.user.groups_id
+ if transition['group_id'] not in user_groups.ids:
return False
return self.wkf_expr_eval_expr(transition['condition'])