diff options
| author | Ysa (Open ERP) <ysa@tinyerp.co.in> | 2010-04-13 18:48:40 +0530 |
|---|---|---|
| committer | Ysa (Open ERP) <ysa@tinyerp.co.in> | 2010-04-13 18:48:40 +0530 |
| commit | a658362faebb44f770d9f2be7c039e8e8f604577 (patch) | |
| tree | b4442e9415be007d0c020e479967ef70db98fa5a | |
| parent | 8a481e4fa2866c096b9aec39b50730e6f3eefaff (diff) | |
[IMP] diagram :- add multiple label on edge.
bzr revid: ysa@tinyerp.co.in-20100413131840-z4luf0k0znjnjrap
| -rw-r--r-- | bin/addons/base/ir/ir_ui_view.py | 10 | ||||
| -rw-r--r-- | 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 @@ <field name="name"/> <field name="kind"/> </node> - <arrow object="workflow.transition" source="act_from" destination="act_to" label="signal"> + <arrow object="workflow.transition" source="act_from" destination="act_to" label="['signal','condition']"> <field name="act_from"/> <field name="act_to"/> <field name="signal"/> |