diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-31 19:07:04 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-31 19:07:04 +0200 |
| commit | 391a29dc423bad5b4740a5aa5612eac982994ec4 (patch) | |
| tree | 50928ca3df2c5d976aa0a8cb466fadbdbb21d676 /addons/web/static/src/js/views/basic | |
| parent | 3462ec3787ac9ecd863e39bd306dc1802e661ffa (diff) | |
| parent | 3becbd764d7af69a58014afa64dce5c85b07aae6 (diff) | |
[MERGE] forward port branch saas-16 up to 3becbd764d7
Diffstat (limited to 'addons/web/static/src/js/views/basic')
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js index 54c8ccfbf51..39e596db5b8 100644 --- a/addons/web/static/src/js/views/basic/basic_controller.js +++ b/addons/web/static/src/js/views/basic/basic_controller.js @@ -238,7 +238,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, { var recordID = record.data.id; this.trigger_up('execute_action', { action_data: _.extend({}, attrs, { - context: record.getContext({additionalContext: attrs.context}), + context: record.getContext({additionalContext: attrs.context || {}}), }), model: record.model, res_ids: [recordID], |