diff options
| author | Olivier Dony <odo@openerp.com> | 2016-01-13 17:13:05 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2016-01-13 17:13:05 +0100 |
| commit | 39bd21fc479a85532e1f6368d3fc9d04c8fb2c68 (patch) | |
| tree | a7dcb9a067e9ba07de11bd5db8c0801019ef96fc /addons/web/static | |
| parent | 9ad5c66a44d9a0bf67089e3f5e530d8d9fb57491 (diff) | |
| parent | 3be9d911c0d50cbe6e4e5768d40011849cc43972 (diff) | |
[MERGE] Forward-port 9.0 up to rev. 3be9d911c0d50cbe6e4e5768d40011849cc43972
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 96107503a5f..4d39d8df806 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -81,7 +81,6 @@ var WidgetButton = common.FormWidget.extend({ }, on_confirmed: function() { var self = this; - var context = this.build_context(); return this.view.do_execute_action( _.extend({}, this.node.attrs, {context: context}), @@ -89,6 +88,8 @@ var WidgetButton = common.FormWidget.extend({ if (!_.isObject(reason)) { self.view.recursive_reload(); } + }).fail(function () { + self.view.recursive_reload(); }); }, check_disable: function() { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index ce4b04a5a87..713a1cf18de 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -195,7 +195,7 @@ <t t-name="WebClient.DebugManager"> <li class="oe_debug_manager"> - <a href="#" t-att-title='_t("Open Debug Menu")' class="dropdown-toggle oe_debug_button" data-toggle="dropdown"> + <a href="#" title="Open Debug Menu" class="dropdown-toggle oe_debug_button" data-toggle="dropdown"> <span class="fa fa-bug"/> <b class="caret"/> </a> |