From 02eef78bbd370895f01e7a281968fface4ac5560 Mon Sep 17 00:00:00 2001 From: Vincent Schippefilt Date: Fri, 2 Mar 2018 12:53:02 +0100 Subject: [PATCH] [FIX] web : remove useless reload of failed _callButtonAction Before this fix, when a _callButtonAction failed, it would reload the model. After this fix we will not reload if a _callButtonAction fails --- addons/web/static/src/js/views/basic/basic_controller.js | 4 +--- addons/web/static/tests/views/form_tests.js | 2 +- 2 files changed, 2 insertions(+), 4 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 bc82710905b..7998a6ca8f1 100644 --- a/addons/web/static/src/js/views/basic/basic_controller.js +++ b/addons/web/static/src/js/views/basic/basic_controller.js @@ -254,9 +254,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, { resIDs: record.res_ids, }, on_success: def.resolve.bind(def), - on_fail: function () { - reload().always(def.reject.bind(def)); - }, + on_fail: def.reject.bind(def), on_closed: reload, }); return this.alive(def); diff --git a/addons/web/static/tests/views/form_tests.js b/addons/web/static/tests/views/form_tests.js index d3b21d265d7..2a64a2f30da 100644 --- a/addons/web/static/tests/views/form_tests.js +++ b/addons/web/static/tests/views/form_tests.js @@ -1032,7 +1032,7 @@ QUnit.module('Views', { }); form.$('.o_form_statusbar button.s').click(); - assert.strictEqual(rpcCount, 2, "should have done 2 rpcs to reload"); + assert.strictEqual(rpcCount, 1, "should have done 1 rpc, because we do not reload anymore if the server action fails"); form.destroy(); });