diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-12-09 16:44:05 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-12-09 16:44:05 +0100 |
| commit | 4022493c0b85f966e499b6c03ac7cce5556f15e6 (patch) | |
| tree | 5e3a13dc8a9547f25e61654deb3c1d713a5fced9 /addons/web/static/src/js/views | |
| parent | ef84226e7549067674ce475ac87473aa8ac8d12b (diff) | |
| parent | da2b88bbbe16904cf86a94e4c8e6b12500c1b205 (diff) | |
[MERGE] forward port of branch 9.0 up to da2b88b
Diffstat (limited to 'addons/web/static/src/js/views')
| -rw-r--r-- | addons/web/static/src/js/views/form_view.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph_view.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot_view.js | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/form_view.js b/addons/web/static/src/js/views/form_view.js index 5e32d8578e4..3e8a9b1e10e 100644 --- a/addons/web/static/src/js/views/form_view.js +++ b/addons/web/static/src/js/views/form_view.js @@ -400,7 +400,7 @@ var FormView = View.extend(common.FieldManagerMixin, { var keys = _.keys(this.fields_view.fields); if (keys.length) { return this.dataset.default_get(keys).then(function(r) { - self.trigger('load_record', r); + self.trigger('load_record', _.clone(r)); }); } return self.trigger('load_record', {}); diff --git a/addons/web/static/src/js/views/graph_view.js b/addons/web/static/src/js/views/graph_view.js index 8a604640fc9..f8f1bba909a 100644 --- a/addons/web/static/src/js/views/graph_view.js +++ b/addons/web/static/src/js/views/graph_view.js @@ -19,6 +19,10 @@ var GraphView = View.extend({ icon: 'fa-bar-chart', view_type: 'graph', + on_detach_callback: function () { + $('body > .nvtooltip').remove(); + }, + init: function(parent, dataset, view_id, options) { this._super(parent, dataset, view_id, options); diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js index 72f1ac4bf1d..deb2c16870f 100644 --- a/addons/web/static/src/js/views/pivot_view.js +++ b/addons/web/static/src/js/views/pivot_view.js @@ -574,7 +574,7 @@ var PivotView = View.extend({ i, j, cell, $row, $cell; var groupby_labels = _.map(this.main_col.groupbys, function (gb) { - return self.groupable_fields[gb.split(':')[0]].string; + return self.fields[gb.split(':')[0]].string; }); for (i = 0; i < headers.length; i++) { |
