Browse Source

Merge pull request #1156 from tarteo/11-web-timeline-fix-reload

[12.0][FIX] web_timeline: Reloading view
pull/1161/head
Pedro M. Baeza 6 years ago
committed by GitHub
parent
commit
34e2041bc3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      web_timeline/__manifest__.py
  2. 11
      web_timeline/static/src/js/timeline_controller.js

2
web_timeline/__manifest__.py

@ -4,7 +4,7 @@
{ {
'name': "Web timeline", 'name': "Web timeline",
'summary': "Interactive visualization chart to show events in time", 'summary': "Interactive visualization chart to show events in time",
"version": "12.0.1.0.2",
"version": "12.0.1.0.3",
"development_status": "Production/Stable", "development_status": "Production/Stable",
'author': 'ACSONE SA/NV, ' 'author': 'ACSONE SA/NV, '
'Tecnativa, ' 'Tecnativa, '

11
web_timeline/static/src/js/timeline_controller.js

@ -37,9 +37,9 @@ odoo.define('web_timeline.TimelineController', function (require) {
* @override * @override
*/ */
update: function (params, options) { update: function (params, options) {
this._super.apply(this, arguments);
var res = this._super.apply(this, arguments);
if (_.isEmpty(params)){ if (_.isEmpty(params)){
return;
return res;
} }
var defaults = _.defaults({}, options, { var defaults = _.defaults({}, options, {
adjust_window: true adjust_window: true
@ -63,6 +63,8 @@ odoo.define('web_timeline.TimelineController', function (require) {
var fields = this.renderer.fieldNames; var fields = this.renderer.fieldNames;
fields = _.uniq(fields.concat(n_group_bys)); fields = _.uniq(fields.concat(n_group_bys));
return $.when(
res,
self._rpc({ self._rpc({
model: self.model.modelName, model: self.model.modelName,
method: 'search_read', method: 'search_read',
@ -71,9 +73,10 @@ odoo.define('web_timeline.TimelineController', function (require) {
domain: domains, domain: domains,
}, },
context: self.getSession().user_context, context: self.getSession().user_context,
}).then(function(data) {
}).then(function (data) {
return self.renderer.on_data_loaded(data, n_group_bys, defaults.adjust_window); return self.renderer.on_data_loaded(data, n_group_bys, defaults.adjust_window);
});
})
);
}, },
/** /**

Loading…
Cancel
Save