summaryrefslogtreecommitdiff
path: root/addons/web_graph/controllers
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@openerp.com>2012-05-08 01:15:22 +0200
committerFabien Pinckaers <fp@openerp.com>2012-05-08 01:15:22 +0200
commitcdedae1f8214084637722ef3d6055157e598cdcd (patch)
tree01280ec3eca8f663c8d4fdc9685a8a4785ea4941 /addons/web_graph/controllers
parent482c1c705d198033f481915d61c0018107a80522 (diff)
[IMP] fix
bzr revid: fp@openerp.com-20120507231522-jryww1mg6kaklb1e
Diffstat (limited to 'addons/web_graph/controllers')
-rw-r--r--addons/web_graph/controllers/graph.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/addons/web_graph/controllers/graph.py b/addons/web_graph/controllers/graph.py
index 71f8190ab0d..3a2f6c6bc37 100644
--- a/addons/web_graph/controllers/graph.py
+++ b/addons/web_graph/controllers/graph.py
@@ -54,7 +54,7 @@ class GraphView(View):
data = data and data[1]
if tick:
return ticks.setdefault(data, len(ticks))
- return data
+ return data or 0
def _orientation(x, y):
if not orientation:
@@ -74,7 +74,7 @@ class GraphView(View):
for x in xaxis:
res = obj.read_group(domain, yaxis+[x], [x], context=context)
result.append( {
- 'data': map(lambda record: _orientation(_convert(x, record[x]), record[yaxis[0]]), res),
+ 'data': map(lambda record: _orientation(_convert(x, record[x]), record[yaxis[0]] or 0), res),
'label': fields[x]['string']
})
else:
@@ -83,12 +83,14 @@ class GraphView(View):
key = x[xaxis[0]]
res = obj.read_group(domain+[(xaxis[0],'=',_convert_key(xaxis[0], key))], yaxis+xaxis[1:2], xaxis[1:2], context=context)
result.append( {
- 'data': map(lambda record: _orientation(_convert(xaxis[1], record[xaxis[1]]), record[yaxis[0]]), res),
+ 'data': map(lambda record: _orientation(_convert(xaxis[1], record[xaxis[1]]), record[yaxis[0]] or 0), res),
'label': _convert(xaxis[0], key, tick=False)
})
- return {
+ res = {
'data': result,
'ticks': map(lambda x: (x[1], x[0]), ticks.items())
}
+ print res
+ return res