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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
17 additions and
14 deletions
-
web_timeline/__manifest__.py
-
web_timeline/static/src/js/timeline_controller.js
|
|
@ -4,7 +4,7 @@ |
|
|
|
{ |
|
|
|
'name': "Web timeline", |
|
|
|
'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", |
|
|
|
'author': 'ACSONE SA/NV, ' |
|
|
|
'Tecnativa, ' |
|
|
|
|
|
@ -37,9 +37,9 @@ odoo.define('web_timeline.TimelineController', function (require) { |
|
|
|
* @override |
|
|
|
*/ |
|
|
|
update: function (params, options) { |
|
|
|
this._super.apply(this, arguments); |
|
|
|
var res = this._super.apply(this, arguments); |
|
|
|
if (_.isEmpty(params)){ |
|
|
|
return; |
|
|
|
return res; |
|
|
|
} |
|
|
|
var defaults = _.defaults({}, options, { |
|
|
|
adjust_window: true |
|
|
@ -63,17 +63,20 @@ odoo.define('web_timeline.TimelineController', function (require) { |
|
|
|
|
|
|
|
var fields = this.renderer.fieldNames; |
|
|
|
fields = _.uniq(fields.concat(n_group_bys)); |
|
|
|
self._rpc({ |
|
|
|
model: self.model.modelName, |
|
|
|
method: 'search_read', |
|
|
|
kwargs: { |
|
|
|
fields: fields, |
|
|
|
domain: domains, |
|
|
|
}, |
|
|
|
context: self.getSession().user_context, |
|
|
|
}).then(function(data) { |
|
|
|
return self.renderer.on_data_loaded(data, n_group_bys, defaults.adjust_window); |
|
|
|
}); |
|
|
|
return $.when( |
|
|
|
res, |
|
|
|
self._rpc({ |
|
|
|
model: self.model.modelName, |
|
|
|
method: 'search_read', |
|
|
|
kwargs: { |
|
|
|
fields: fields, |
|
|
|
domain: domains, |
|
|
|
}, |
|
|
|
context: self.getSession().user_context, |
|
|
|
}).then(function (data) { |
|
|
|
return self.renderer.on_data_loaded(data, n_group_bys, defaults.adjust_window); |
|
|
|
}) |
|
|
|
); |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|