summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/chrome/abstract_action.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/web/static/src/js/chrome/abstract_action.js b/addons/web/static/src/js/chrome/abstract_action.js
index a5f98434ddb..c40f831e98e 100644
--- a/addons/web/static/src/js/chrome/abstract_action.js
+++ b/addons/web/static/src/js/chrome/abstract_action.js
@@ -91,20 +91,20 @@ var AbstractAction = Widget.extend(ActionMixin, {
*/
willStart: function () {
var self = this;
+ var defs = [this._super.apply(this, arguments)];
if (this.hasControlPanel) {
var params = this.controlPanelParams;
- var def;
if (this.loadControlPanel) {
- def = this
+ defs.push(this
.loadFieldView(params.modelName, params.context || {}, params.viewId, 'search')
.then(function (fieldsView) {
params.viewInfo = {
arch: fieldsView.arch,
fields: fieldsView.fields,
};
- });
+ }));
}
- return $.when(def).then(function () {
+ return $.when.apply(this, defs).then(function () {
var controlPanelView = new self.config.ControlPanelView(params);
return controlPanelView.getController(self).then(function (controlPanel) {
self._controlPanel = controlPanel;
@@ -112,7 +112,7 @@ var AbstractAction = Widget.extend(ActionMixin, {
});
});
}
- return $.when();
+ return $.when.apply(this, defs);
},
/**
* @override