diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-03-11 14:42:34 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-03-11 14:42:34 +0100 |
| commit | 71faa19af06d5002be627adbfd92dc25941c69c6 (patch) | |
| tree | c6abaadf36cea49d1b2a2779cf487974ca1c650f /addons/web/static/src/js/views/abstract_controller.js | |
| parent | 0c1eff0d95869b9b4eab8b34e65be770e49fdd2b (diff) | |
| parent | 2b3296bbf8b5d08fad20a4ca8d83ebb0aa7303b3 (diff) | |
[MERGE] forward port branch saas-12.1 up to 2b3296bbf8b
Diffstat (limited to 'addons/web/static/src/js/views/abstract_controller.js')
| -rw-r--r-- | addons/web/static/src/js/views/abstract_controller.js | 7 |
1 files changed, 5 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 b5d7c8fe8b3..53afb4a1fbd 100644 --- a/addons/web/static/src/js/views/abstract_controller.js +++ b/addons/web/static/src/js/views/abstract_controller.js @@ -246,7 +246,7 @@ var AbstractController = mvc.Controller.extend(ActionMixin, { return; } self.renderer.setLocalState(localState); - return self._update(state); + return self._update(state, params); }); }); }, @@ -402,12 +402,15 @@ var AbstractController = mvc.Controller.extend(ActionMixin, { * * @private * @param {Object} state the state given by the model + * @param {Object} [params] + * @param {Object[]} [params.breadcrumbs] * @returns {Deferred} */ - _update: function () { + _update: function (state, params) { // AAB: update the control panel -> this will be moved elsewhere at some point var cpContent = _.extend({}, this.controlPanelElements); this.updateControlPanel({ + breadcrumbs: params && params.breadcrumbs, cp_content: cpContent, title: this.getTitle(), }); |
