From e583cf5f0dc5af07b1386661207729b04695f615 Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Wed, 21 Sep 2011 10:57:17 +0530 Subject: [FIX] web 6.1 does not accept None and integer dict key. bzr revid: vda@tinyerp.com-20110921052717-12cxwnz04jeiddx6 --- addons/process/process.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index 72c8bce10b4..b4b82c13fac 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -84,12 +84,12 @@ class process_process(osv.osv): process = pool.get('process.process').browse(cr, uid, id, context=context) name = process.name - resource = None + resource = False state = 'N/A' expr_context = {} states = {} - perm = None + perm = False if res_model: states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {})) @@ -242,7 +242,12 @@ class process_process(osv.osv): for k, v in nodes.items(): y = v['y'] v['y'] = min(y - miny + 10, y) - + for k,v in nodes.items(): + k = str(k) + for t,i in transitions.items(): + t = str(t) + nodes = dict([str(n_key), n_val] for n_key, n_val in nodes.iteritems()) + transitions = dict([str(t_key), t_val] for t_key, t_val in transitions.iteritems()) 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=None): -- cgit v1.2.3 From 9862fa094e8979a0566a2391f03a990da44093f8 Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Wed, 21 Sep 2011 13:35:00 +0530 Subject: [FIX] clean up. bzr revid: vda@tinyerp.com-20110921080500-0dljjjesk3umhwl8 --- addons/process/process.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'addons/process/process.py') diff --git a/addons/process/process.py b/addons/process/process.py index b4b82c13fac..524a3236e7b 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -242,10 +242,7 @@ class process_process(osv.osv): for k, v in nodes.items(): y = v['y'] v['y'] = min(y - miny + 10, y) - for k,v in nodes.items(): - k = str(k) - for t,i in transitions.items(): - t = str(t) + nodes = dict([str(n_key), n_val] for n_key, n_val in nodes.iteritems()) transitions = dict([str(t_key), t_val] for t_key, t_val in transitions.iteritems()) return dict(name=name, resource=resource, state=state, perm=perm, notes=notes, nodes=nodes, transitions=transitions) -- cgit v1.2.3