diff options
| author | Ysa (Open ERP) <ysa@tinyerp.co.in> | 2010-04-13 18:27:53 +0530 |
|---|---|---|
| committer | Ysa (Open ERP) <ysa@tinyerp.co.in> | 2010-04-13 18:27:53 +0530 |
| commit | 8a481e4fa2866c096b9aec39b50730e6f3eefaff (patch) | |
| tree | ed889acb0968fe290ff1925055e747bae16a780c | |
| parent | eebbd52d8a2dce5e1de84b66094cf9847fdf0187 (diff) | |
[IMP] diagram :- rename arrow attribute single to label.
bzr revid: ysa@tinyerp.co.in-20100413125753-oryt6quuq1x00nub
| -rw-r--r-- | bin/addons/base/ir/ir_ui_view.py | 12 | ||||
| -rw-r--r-- | bin/addons/base/ir/workflow/workflow_view.xml | 2 | ||||
| -rw-r--r-- | bin/addons/base/rng/view.rng | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/bin/addons/base/ir/ir_ui_view.py b/bin/addons/base/ir/ir_ui_view.py index 95ce993c8b1..ae92bacf9d5 100644 --- a/bin/addons/base/ir/ir_ui_view.py +++ b/bin/addons/base/ir/ir_ui_view.py @@ -132,13 +132,13 @@ class view(osv.osv): return super(view, self).write(cr, uid, ids, vals, context) - def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node,signal,scale,context={}): + def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node,label,scale,context={}): nodes=[] nodes_name=[] transitions=[] start=[] tres={} - sig={} + labels={} no_ancester=[] blank_nodes = [] @@ -177,9 +177,9 @@ 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(signal)) and str(t[signal])=='False': - t[signal]=' ' - sig[str(t['id'])] = (a['id'],t.get(signal,' ')) + if t.has_key(str(label)) and str(t[label])=='False': + t[label]=' ' + labels[str(t['id'])] = (a['id'],t.get(label,' ')) g = graph(nodes, transitions, no_ancester) g.process(start) g.scale(*scale) @@ -188,7 +188,7 @@ class view(osv.osv): for node in nodes_name: results[str(node[0])] = result[node[0]] results[str(node[0])]['name'] = node[1] - return {'nodes': results, 'transitions': tres, 'signal' : sig, 'blank_nodes': blank_nodes} + return {'nodes': results, 'transitions': tres, 'label' : labels, 'blank_nodes': blank_nodes} view() class view_sc(osv.osv): diff --git a/bin/addons/base/ir/workflow/workflow_view.xml b/bin/addons/base/ir/workflow/workflow_view.xml index 04457f21338..a3d6cf5d1b5 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" signal="signal"> + <arrow object="workflow.transition" source="act_from" destination="act_to" label="signal"> <field name="act_from"/> <field name="act_to"/> <field name="signal"/> diff --git a/bin/addons/base/rng/view.rng b/bin/addons/base/rng/view.rng index f3d060bf343..d2d108a2163 100644 --- a/bin/addons/base/rng/view.rng +++ b/bin/addons/base/rng/view.rng @@ -63,7 +63,7 @@ <rng:attribute name="source" /> <rng:attribute name="destination" /> <rng:optional><rng:attribute name="form_view_ref"/></rng:optional> - <rng:optional><rng:attribute name="signal"/></rng:optional> + <rng:optional><rng:attribute name="label"/></rng:optional> <rng:zeroOrMore> <rng:choice> <rng:ref name="field"/> |