summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js
diff options
context:
space:
mode:
authoreco-odoo <eco@odoo.com>2018-07-11 10:40:16 +0200
committerYannick Tivisse <yti@odoo.com>2018-07-20 11:59:12 +0200
commit872cf9160da2f260879b76eb9bd400a81f3e13a1 (patch)
treee864346112d270674e446c9b95c2cade5700dee6 /addons/web/static/src/js
parentc1498ff36be4ce0b175f340e2f5690a37421ccd7 (diff)
[FIX] web: controller update now waits for _update to resolve
Before this, the deffered returned by _update was not taken into account.
Diffstat (limited to 'addons/web/static/src/js')
-rw-r--r--addons/web/static/src/js/views/abstract_controller.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/abstract_controller.js b/addons/web/static/src/js/views/abstract_controller.js
index f4f323b01ba..155b1792dc6 100644
--- a/addons/web/static/src/js/views/abstract_controller.js
+++ b/addons/web/static/src/js/views/abstract_controller.js
@@ -91,7 +91,7 @@ var AbstractController = AbstractAction.extend(ControlPanelMixin, {
this._super.apply(this, arguments),
this.renderer.appendTo(this.$el)
).then(function () {
- self._update(self.initialState);
+ return self._update(self.initialState);
});
},
/**
@@ -257,7 +257,7 @@ var AbstractController = AbstractAction.extend(ControlPanelMixin, {
return;
}
self.renderer.setLocalState(localState);
- self._update(state);
+ return self._update(state);
});
});
},