diff options
| author | Gery Debongnie <ged@openerp.com> | 2014-01-28 14:26:25 +0100 |
|---|---|---|
| committer | Gery Debongnie <ged@openerp.com> | 2014-01-28 14:26:25 +0100 |
| commit | ad76309fbe29f6d4d2d26393bc8d2b1c595a124f (patch) | |
| tree | e7eaea5f4212e8482845564b7249798de57423e9 /addons/web_graph | |
| parent | 31374c2eeffe824188b1a43768bc216a86d29b03 (diff) | |
[IMP] makes the graph view in pivot table mode always display 'Total' instead of the current measure/title (addon web_graph)
bzr revid: ged@openerp.com-20140128132625-pk21iuhuffvx6814
Diffstat (limited to 'addons/web_graph')
| -rw-r--r-- | addons/web_graph/static/src/js/graph_widget.js | 7 | ||||
| -rw-r--r-- | addons/web_graph/static/src/js/pivot_table.js | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/addons/web_graph/static/src/js/graph_widget.js b/addons/web_graph/static/src/js/graph_widget.js index c17fd0bcf43..100ae21acce 100644 --- a/addons/web_graph/static/src/js/graph_widget.js +++ b/addons/web_graph/static/src/js/graph_widget.js @@ -21,7 +21,6 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ this.domain = domain; this.mode = options.mode || 'pivot'; // pivot, bar, pie, line this.heatmap_mode = options.heatmap_mode || 'none'; - this.title = options.title || 'Graph'; this.visible_ui = options.visible_ui || true; this.bar_ui = options.bar_ui || 'group'; this.graph_view = options.graph_view || null; @@ -384,12 +383,6 @@ openerp.web_graph.Graph = openerp.web.Widget.extend({ // Drawing the table // ---------------------------------------------------------------------- draw_table: function () { - this.pivot.main_row().title = _t('Total'); - if (this.pivot.measures.length == 1) { - this.pivot.main_col().title = this.pivot.measures[0].string; - } else { - this.pivot.main_col().title = _t(this.title); - } this.draw_top_headers(); _.each(this.pivot.rows.headers, this.proxy('draw_row')); }, diff --git a/addons/web_graph/static/src/js/pivot_table.js b/addons/web_graph/static/src/js/pivot_table.js index 89ca36f3b61..fccb1e4bffa 100644 --- a/addons/web_graph/static/src/js/pivot_table.js +++ b/addons/web_graph/static/src/js/pivot_table.js @@ -238,7 +238,7 @@ openerp.web_graph.PivotTable = openerp.web.Class.extend({ }, make_header: function (group, parent) { - var title = parent ? group.attributes.value : ''; + var title = parent ? group.attributes.value : _t('Total'); return { id: _.uniqueId(), path: parent ? parent.path.concat(title) : [], |