[tryton-commits] changeset in sao:default Do not destroy record not deleted and d...

[Cédric Krier]

changeset b57c4f871b1e in sao:default
details: https://hg.tryton.org/sao?cmd=changeset&node=b57c4f871b1e
description:
        Do not destroy record not deleted and do not try to return '*' field

        issue10349
        review357981002
diffstat:

 src/model.js |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r f53aad05ec58 -r b57c4f871b1e src/model.js
--- a/src/model.js      Fri Apr 30 13:46:02 2021 +0200
+++ b/src/model.js      Fri Apr 30 13:47:22 2021 +0200
@@ -269,12 +269,14 @@
             context._timestamp = {};
             records.forEach(function(record) {
                 jQuery.extend(context._timestamp, record.get_timestamp());
-                record.destroy();
             });
             var record_ids = records.map(function(record) {
                 return record.id;
             });
             return 
root_group.on_write_ids(record_ids).then(function(reload_ids) {
+                records.forEach(function(record) {
+                    record.destroy();
+                });
                 reload_ids = reload_ids.filter(function(e) {
                     return !~record_ids.indexOf(e);
                 });
@@ -651,7 +653,13 @@
                 async = true;
             }
             if (this.destroyed || this.is_loaded(name)) {
-                return async? jQuery.when() : this.model.fields[name];
+                if (async) {
+                    return jQuery.when();
+                } else if (name !== '*') {
+                    return this.model.fields[name];
+                } else {
+                    return;
+                }
             }
             if (this.group.prm.state() == 'pending') {
                 return this.group.prm.then(function() {
@@ -830,7 +838,11 @@
                 } else {
                     failed();
                 }
-                return this.model.fields[name];
+                if (name !== '*') {
+                    return this.model.fields[name];
+                } else {
+                    return;
+                }
             }
         },
         set: function(values, validate) {