diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-10-05 14:49:19 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-10-05 14:49:19 +0200 |
| commit | b965ae5cf79f87a838d8a941f154390737895c4a (patch) | |
| tree | 168596c17d07c92af9bc29d3acc78f1ea5ecbf81 /addons/web_graph/controllers/graph.py | |
| parent | 6a23c24da13f5907d4c407e919bff187a3a0ae1d (diff) | |
| parent | c8c4086fd655b09f5fc0a4bde4d43d95745520f1 (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20121005124919-yfkbzk3mjm0tot4e
Diffstat (limited to 'addons/web_graph/controllers/graph.py')
| -rw-r--r-- | addons/web_graph/controllers/graph.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py index f6c1343c042..e5c15898155 100644 --- a/addons/web_graph/controllers/graph.py +++ b/addons/web_graph/controllers/graph.py @@ -52,6 +52,9 @@ class GraphView(View): def _convert(field, data, tick=True): if fields[field]['type']=='many2one': data = data and data[1] + elif (fields[field]['type']=='selection') and (type(fields[field]['selection']) in (list, tuple)): + d = dict(fields[field]['selection']) + data = d[data] if tick: return ticks.setdefault(data, len(ticks)) return data or 0 |