[tryton-commits] changeset in sao:5.8 Close tab when cancelling save on new record

[Maxime Richez]

changeset 279f4dca4fbe in sao:5.8
details: https://hg.tryton.org/sao?cmd=changeset&node=279f4dca4fbe
description:
        Close tab when cancelling save on new record

        issue10480
        review363421002
        (grafted from bea021af96d55137e35bae1ade78aff6799890e3)
diffstat:

 src/tab.js |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 4d97b7c1723d -r 279f4dca4fbe src/tab.js
--- a/src/tab.js        Thu Sep 09 22:57:09 2021 +0200
+++ b/src/tab.js        Fri Sep 10 19:37:47 2021 +0200
@@ -730,7 +730,13 @@
             );
         },
         _close_allowed: function() {
-            return this.modified_save();
+            return this.modified_save().then(null, function(result) {
+                if (result) {
+                    return jQuery.Deferred().resolve();
+                } else {
+                    return jQuery.Deferred().reject();
+                }
+            });
         },
         modified_save: function() {
             this.screen.save_tree_state();
@@ -746,13 +752,14 @@
                             case 'ko':
                                 var record_id = this.screen.current_record.id;
                                 return this.reload(false).then(function() {
-                                    if (this.screen.current_record) {
+                                    if (record_id < 0) {
+                                        return jQuery.Deferred().reject(true);
+                                    }
+                                    else if (this.screen.current_record) {
                                         if (record_id !=
                                             this.screen.current_record.id) {
                                             return jQuery.Deferred().reject();
                                         }
-                                    } else if (record_id < 0) {
-                                        return jQuery.Deferred().resolve();
                                     }
                                 }.bind(this));
                             default: