From 9c6a184fb5aa77561655ae1ea21d34b6ecb8aa5e Mon Sep 17 00:00:00 2001 From: Vidhin Mehta Date: Fri, 25 Jan 2013 12:32:40 +0530 Subject: [FIX]graph view usability bug. bzr revid: vme@tinyerp.com-20130125070240-0drtmiyetwu2btc6 --- addons/web_graph/static/src/js/graph.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/web_graph/static') diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 35ad0aaaea8..28e1cf65f12 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -5,6 +5,7 @@ openerp.web_graph = function (instance) { var _lt = instance.web._lt; +var _t = instance.web._t; // removed ``undefined`` values var filter_values = function (o) { @@ -365,7 +366,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ }).then(function() { var res = { 'data': result, - 'ticks': _.map(ticks, function(el, key) { return [el, key] }) + 'ticks': _.map(ticks, function(el, key) { return [el, key || _t("Undefined")] }) }; return res; }); -- cgit v1.2.3 From 007bce3f6c846c7b7f42c01f99fae1b93f85143e Mon Sep 17 00:00:00 2001 From: chirag patel Date: Wed, 8 May 2013 16:05:06 +0530 Subject: [FIX] Fixed graph multiple group show wrong results. bzr revid: cpa@tinyerp.com-20130508103506-n8gq6dvvcv5wi3bi --- addons/web_graph/static/src/js/graph.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_graph/static') diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 8710b840209..55ce776fa60 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -343,7 +343,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ var defs = []; _.each(axis, function(x) { var key = x[xaxis[0]] - defs.push(obj.call("read_group", [domain, yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) { + defs.push(obj.call("read_group", [x['__domain'], yaxis.concat(xaxis.slice(1, 2)), xaxis.slice(1, 2)], {context: context}).then(function(res) { return [x, key, res]; })); }); -- cgit v1.2.3 From 672933ebfe414c2e4d42bbd30af5a7bac835811d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 5 Jun 2013 14:43:27 +0200 Subject: [IMP] PNG recompression bzr revid: xmo@openerp.com-20130605124327-poy97bvw73sdm1o6 --- .../static/lib/flotr2/lib/jasmine/jasmine_favicon.png | Bin 905 -> 700 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'addons/web_graph/static') diff --git a/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png b/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png index 218f3b43713..bd147955254 100644 Binary files a/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png and b/addons/web_graph/static/lib/flotr2/lib/jasmine/jasmine_favicon.png differ -- cgit v1.2.3