From 12fcd1be2f1a891b7fe099ad0044e68c45280907 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Fri, 19 Nov 2010 19:18:01 +0530 Subject: [IMP] : Added context=None on methods used for _constraints and replaced context={} with context=None. bzr revid: uco@tinyerp.com-20101119134801-974ev29j4tu46pq2 --- addons/process/process.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index 544ff73e761..2d58cef7690 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -245,7 +245,7 @@ class process_process(osv.osv): return dict(name=name, resource=resource, state=state, perm=perm, notes=notes, nodes=nodes, transitions=transitions) - def copy(self, cr, uid, id, default=None, context={}): + def copy(self, cr, uid, id, default=None, context=None): """ Deep copy the entire process. """ @@ -309,7 +309,7 @@ class process_node(osv.osv): 'flow_start': lambda *args: False, } - def copy_data(self, cr, uid, id, default=None, context={}): + def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} default.update({ @@ -366,11 +366,11 @@ class process_transition_action(osv.osv): 'state': lambda *args: 'dummy', } - def copy_data(self, cr, uid, id, default=None, context={}): + def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} - state = self.pool.get('process.transition.action').browse(cr, uid, [id], context)[0].state + state = self.pool.get('process.transition.action').browse(cr, uid, [id], context=context)[0].state if state: default['state'] = state -- cgit v1.2.3 From 8035df3e1152a8f9d9703037d9d1bee718d94331 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Mon, 22 Nov 2010 16:07:53 +0530 Subject: [IMP]: Added context=None in function argument for rest modules. bzr revid: uco@tinyerp.com-20101122103753-idv9fdaqc28rvugu --- addons/process/process.py | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index 2d58cef7690..676b75ae47e 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -52,7 +52,9 @@ class process_process(osv.osv): 'active' : lambda *a: True, } - def search_by_model(self, cr, uid, res_model, context): + def search_by_model(self, cr, uid, res_model, context=None): + if not context: + context = {} pool = pooler.get_pool(cr.dbname) model_ids = (res_model or None) and pool.get('ir.model').search(cr, uid, [('model', '=', res_model)]) @@ -62,7 +64,7 @@ class process_process(osv.osv): # search all processes res = pool.get('process.process').search(cr, uid, domain) if res: - res = pool.get('process.process').browse(cr, uid, res, context) + res = pool.get('process.process').browse(cr, uid, res, context=context) for process in res: result.append((process.id, process.name)) return result @@ -70,18 +72,20 @@ class process_process(osv.osv): # else search process nodes res = pool.get('process.node').search(cr, uid, domain) if res: - res = pool.get('process.node').browse(cr, uid, res, context) + res = pool.get('process.node').browse(cr, uid, res, context=context) for node in res: if (node.process_id.id, node.process_id.name) not in result: result.append((node.process_id.id, node.process_id.name)) return result - def graph_get(self, cr, uid, id, res_model, res_id, scale, context): + def graph_get(self, cr, uid, id, res_model, res_id, scale, context=None): + if not context: + context = {} pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, [id], context)[0] + process = pool.get('process.process').browse(cr, uid, [id], context=context)[0] name = process.name resource = None @@ -95,13 +99,13 @@ class process_process(osv.osv): states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {})) if res_id: - current_object = pool.get(res_model).browse(cr, uid, [res_id], context)[0] - current_user = pool.get('res.users').browse(cr, uid, [uid], context)[0] + current_object = pool.get(res_model).browse(cr, uid, [res_id], context=context)[0] + current_user = pool.get('res.users').browse(cr, uid, [uid], context=context)[0] expr_context = Env(current_object, current_user) resource = current_object.name if 'state' in current_object: state = states.get(current_object.state, 'N/A') - perm = pool.get(res_model).perm_read(cr, uid, [res_id], context)[0] + perm = pool.get(res_model).perm_read(cr, uid, [res_id], context=context)[0] notes = process.note or "N/A" nodes = {} @@ -188,7 +192,7 @@ class process_process(osv.osv): nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model} - refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0] + refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context=context)[0] fields = pool.get(ref_model).fields_get(cr, uid, context=context) # check for directory_id from inherited from document module @@ -251,9 +255,12 @@ class process_process(osv.osv): if not default: default = {} + + if not context: + context = {} pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, [id], context)[0] + process = pool.get('process.process').browse(cr, uid, [id], context=context)[0] nodes = {} transitions = {} @@ -312,11 +319,13 @@ class process_node(osv.osv): def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} + if not context: + context = {} default.update({ 'transition_in': [], 'transition_out': [] }) - return super(process_node, self).copy_data(cr, uid, id, default, context) + return super(process_node, self).copy_data(cr, uid, id, default, context=context) process_node() @@ -369,6 +378,9 @@ class process_transition_action(osv.osv): def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} + + if not context: + context = {} state = self.pool.get('process.transition.action').browse(cr, uid, [id], context=context)[0].state if state: -- cgit v1.2.3 From 6dd290e8245f4ea91ce87b0f3b5f29bafeaf12e9 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Tue, 23 Nov 2010 12:35:05 +0530 Subject: [REF]: Replace the condition 'if not context' with 'if context is None'. bzr revid: uco@tinyerp.com-20101123070505-9i2lrqhgxzaii3zn --- addons/process/process.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index 676b75ae47e..e8c524b6857 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -53,8 +53,6 @@ class process_process(osv.osv): } def search_by_model(self, cr, uid, res_model, context=None): - if not context: - context = {} pool = pooler.get_pool(cr.dbname) model_ids = (res_model or None) and pool.get('ir.model').search(cr, uid, [('model', '=', res_model)]) @@ -80,8 +78,6 @@ class process_process(osv.osv): return result def graph_get(self, cr, uid, id, res_model, res_id, scale, context=None): - if not context: - context = {} pool = pooler.get_pool(cr.dbname) @@ -256,9 +252,6 @@ class process_process(osv.osv): if not default: default = {} - if not context: - context = {} - pool = pooler.get_pool(cr.dbname) process = pool.get('process.process').browse(cr, uid, [id], context=context)[0] @@ -319,8 +312,6 @@ class process_node(osv.osv): def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} - if not context: - context = {} default.update({ 'transition_in': [], 'transition_out': [] @@ -379,9 +370,6 @@ class process_transition_action(osv.osv): if not default: default = {} - if not context: - context = {} - state = self.pool.get('process.transition.action').browse(cr, uid, [id], context=context)[0].state if state: default['state'] = state -- cgit v1.2.3 From 3700e08ed6b0d06e6b423dc7cfd02efff1e54f11 Mon Sep 17 00:00:00 2001 From: "uco (OpenERP)" Date: Tue, 23 Nov 2010 17:01:52 +0530 Subject: [REF]: Refactored some lines from previous commit. bzr revid: uco@tinyerp.com-20101123113152-0ue71yg9usp1gklx --- addons/process/process.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index e8c524b6857..157e0076aa8 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -81,7 +81,7 @@ class process_process(osv.osv): pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, [id], context=context)[0] + process = pool.get('process.process').browse(cr, uid, id, context=context) name = process.name resource = None @@ -95,8 +95,8 @@ class process_process(osv.osv): states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {})) if res_id: - current_object = pool.get(res_model).browse(cr, uid, [res_id], context=context)[0] - current_user = pool.get('res.users').browse(cr, uid, [uid], context=context)[0] + current_object = pool.get(res_model).browse(cr, uid, res_id, context=context) + current_user = pool.get('res.users').browse(cr, uid, uid, context=context) expr_context = Env(current_object, current_user) resource = current_object.name if 'state' in current_object: @@ -188,7 +188,7 @@ class process_process(osv.osv): nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model} - refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context=context)[0] + refobj = pool.get(ref_model).browse(cr, uid, ref_id, context=context) fields = pool.get(ref_model).fields_get(cr, uid, context=context) # check for directory_id from inherited from document module @@ -253,7 +253,7 @@ class process_process(osv.osv): default = {} pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, [id], context=context)[0] + process = pool.get('process.process').browse(cr, uid, id, context=context) nodes = {} transitions = {} @@ -370,7 +370,7 @@ class process_transition_action(osv.osv): if not default: default = {} - state = self.pool.get('process.transition.action').browse(cr, uid, [id], context=context)[0].state + state = self.pool.get('process.transition.action').browse(cr, uid, id, context=context).state if state: default['state'] = state -- cgit v1.2.3