[tryton-commits] changeset in sao:5.0 Display screen after reload on Window Form ...

[Cédric Krier]

changeset 880d9fa240f0 in sao:5.0
details: https://hg.tryton.org/sao?cmd=changeset&node=880d9fa240f0
description:
        Display screen after reload on Window Form cancel

        The callback must also be called once every promises are resolved.

        issue10304
        review330771002
        (grafted from bfc5dfdf1434f597ac44b0cba38207f32a0b069b)
diffstat:

 src/window.js |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 688876084b37 -r 880d9fa240f0 src/window.js
--- a/src/window.js     Sun Apr 18 17:52:45 2021 +0200
+++ b/src/window.js     Thu Apr 22 00:05:24 2021 +0200
@@ -411,7 +411,9 @@
                         this._initial_value);
                 } else if (record.has_changed()) {
                     record.cancel();
-                    cancel_prm = record.reload();
+                    cancel_prm = record.reload().then(function() {
+                        this.screen.display();
+                    }.bind(this));
                 }
                 if (added) {
                     record._changed.id = added;
@@ -419,7 +421,7 @@
             } else {
                 result = response_id != 'RESPONSE_CANCEL';
             }
-            (cancel_prm || jQuery.when()).done(function() {
+            (cancel_prm || jQuery.when()).then(function() {
                 this.callback(result);
                 this.destroy();
             }.bind(this));