From a658362faebb44f770d9f2be7c039e8e8f604577 Mon Sep 17 00:00:00 2001 From: "Ysa (Open ERP)" Date: Tue, 13 Apr 2010 18:48:40 +0530 Subject: [PATCH] [IMP] diagram :- add multiple label on edge. bzr revid: ysa@tinyerp.co.in-20100413131840-z4luf0k0znjnjrap --- bin/addons/base/ir/ir_ui_view.py | 10 +++++++--- bin/addons/base/ir/workflow/workflow_view.xml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py index ae92bacf9d5..1bd454c6a8b 100644 --- a/bin/addons/base/ir/ir_ui_view.py +++ b/bin/addons/base/ir/ir_ui_view.py @@ -177,9 +177,13 @@ class view(osv.osv): for t in _Arrow_Obj.read(cr,uid, a[_Destination_Field],[]): transitions.append((a['id'], t[des_node][0])) tres[str(t['id'])] = (a['id'],t[des_node][0]) - if t.has_key(str(label)) and str(t[label])=='False': - t[label]=' ' - labels[str(t['id'])] = (a['id'],t.get(label,' ')) + label_string = "" + for lbl in eval(label): + if t.has_key(str(lbl)) and str(t[lbl])=='False': + label_string = label_string + ' ' + else: + label_string = label_string + " " + t[lbl] + labels[str(t['id'])] = (a['id'],label_string) g = graph(nodes, transitions, no_ancester) g.process(start) g.scale(*scale) diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index a3d6cf5d1b5..2868096119a 100644 --- a/bin/addons/base/ir/workflow/workflow_view.xml +++ b/bin/addons/base/ir/workflow/workflow_view.xml @@ -34,7 +34,7 @@ - +