diff options
| author | Gery Debongnie <ged@openerp.com> | 2013-11-26 16:57:06 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2013-11-26 16:57:06 +0100 |
| commit | 857b48749b79bca158ddf1b5b4096dd6cf061d22 (patch) | |
| tree | a58d37687f658b7b26f627414f242e92949fb1d3 /addons/web_graph/static/src | |
| parent | 4eef57206502a1d3201f256027d370f3cf386c5f (diff) | |
[IMP] updates the pivot table domain when search view is activated
bzr revid: ged@openerp.com-20131126155706-nqc6hgjbyty8jju2
Diffstat (limited to 'addons/web_graph/static/src')
| -rw-r--r-- | addons/web_graph/static/src/js/graph.js | 1 | ||||
| -rw-r--r-- | addons/web_graph/static/src/js/pivot.js | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 2aeb68b9869..3d218e38eba 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -161,6 +161,7 @@ instance.web_graph.GraphView = instance.web.View.extend({ self.pivot_table = new PivotTable(self.data); self.pivot_table.start().then(self.proxy('draw_table')); } else { + this.pivot_table.domain = domain; this.pivot_table.update_values().done(function () { self.draw_table(); }); diff --git a/addons/web_graph/static/src/js/pivot.js b/addons/web_graph/static/src/js/pivot.js index b918474be47..5516f5caf5c 100644 --- a/addons/web_graph/static/src/js/pivot.js +++ b/addons/web_graph/static/src/js/pivot.js @@ -330,10 +330,7 @@ var PivotTable = openerp.web.Class.extend({ row_data = _.last(_.initial(args)), cell_data = args; - var result = self.format_data(total, col_data, row_data, cell_data); - console.log("result final",result); - return result; - + return self.format_data(total, col_data, row_data, cell_data); }); }, |