diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-09-24 13:54:26 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-09-24 13:54:26 +0200 |
| commit | d41d28ea5f9cbd31e44560f171cab6c1966615b0 (patch) | |
| tree | a35b8cad3ed04b70c60d0d5828009191bd05c986 /addons/web_graph/controllers/graph.py | |
| parent | 443a7ec6cc8c08e940f4a4dbc31ae4528a041381 (diff) | |
| parent | f7255ac0b3b7e6b3d2dc67b571f7a169b2019598 (diff) | |
merge upstream
bzr revid: chs@openerp.com-20120921145630-7ejla348yybsy890
bzr revid: chs@openerp.com-20120924115426-84no8926sccaymmt
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 |