tryton-sao 6.6.9 → 6.6.11

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 6.6.11 - 2023-11-03
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 6.6.10 - 2023-10-04
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 6.6.9 - 2023-09-06
 --------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.js

@@ -1,7 +1,7 @@
 /* This file is part of Tryton.  The COPYRIGHT file at the top level of
    this repository contains the full copyright notices and license terms. */
 var Sao = {
-    __version__: '6.6.9',
+    __version__: '6.6.11',
 };
 
 (function() {
@@ -7553,13 +7553,13 @@ var Sao = {
             if (this.indexOf(record) < 0) {
                 this.splice(position, 0, record);
             }
-            for (var record_rm in this.record_removed) {
+            for (var record_rm of this.record_removed) {
                 if (record_rm.id == record.id) {
                     this.record_removed.splice(
                             this.record_removed.indexOf(record_rm), 1);
                 }
             }
-            for (var record_del in this.record_deleted) {
+            for (var record_del of this.record_deleted) {
                 if (record_del.id == record.id) {
                     this.record_deleted.splice(
                             this.record_deleted.indexOf(record_del), 1);
@@ -8412,7 +8412,7 @@ var Sao = {
         get_eval: function() {
             var value = {};
             for (var key in this.model.fields) {
-                if (!this.model.fields.hasOwnProperty(key) && this.id >= 0)
+                if (!this._loaded.hasOwnProperty(key) && this.id >= 0)
                     continue;
                 value[key] = this.model.fields[key].get_eval(this);
             }
@@ -11256,6 +11256,7 @@ var Sao = {
                         revision.add(1, 'milliseconds');
                     }
                     if ((this.screen.current_view.view_type == 'form') &&
+                            revision &&
                             (revision < revisions[revisions.length - 1][0])) {
                         revision = revisions[revisions.length - 1][0];
                     }
@@ -11282,7 +11283,13 @@ var Sao = {
                 return this.screen.model.execute('history_revisions',
                     [ids], this.screen.context)
                     .then(revisions => {
-                        new Sao.Window.Revision(revisions, set_revision(revisions));
+                        const revision = this.screen.context._datetime;
+                        if (revision) {
+                            // Remove a millisecond as microseconds are truncated
+                            revision.add(-1, 'milliseconds');
+                        }
+                        new Sao.Window.Revision(
+                            revisions, revision, set_revision(revisions));
                     });
             });
         },
@@ -12991,7 +12998,8 @@ var Sao = {
             var domain = this.search_domain(search_string, true);
 
             var context = this.context;
-            if (this.screen_container.but_active.hasClass('active')) {
+            if ((this.screen_container.but_active.css('display') != 'none') &&
+                this.screen_container.but_active.hasClass('active')) {
                 context.active_test = false;
             }
             const search = () => {
@@ -13072,7 +13080,8 @@ var Sao = {
             } else {
                 domain = this.domain;
             }
-            if (this.screen_container.but_active.hasClass('active')) {
+            if ((this.screen_container.but_active.css('display') != 'none') &&
+                this.screen_container.but_active.hasClass('active')) {
                 if (!jQuery.isEmptyObject(domain)) {
                     domain = [domain, ['active', '=', false]];
                 } else {
@@ -13300,6 +13309,17 @@ var Sao = {
                         deferreds.push(view.display());
                     }
                 }
+                if (this.current_view.view_type == 'tree') {
+                    let view_tree = this.fields_view_tree[
+                        this.current_view.view_id] || {};
+                    if ('active' in view_tree.fields) {
+                        this.screen_container.but_active.show();
+                    } else {
+                        this.screen_container.but_active.hide();
+                    }
+                } else {
+                    this.screen_container.but_active.hide();
+                }
             }
             return jQuery.when.apply(jQuery, deferreds).then(
                 () => this.set_tree_state().then(() => {
@@ -13742,12 +13762,6 @@ var Sao = {
                 fields = dom_fields;
             }
 
-            if ('active' in view_tree.fields) {
-                this.screen_container.but_active.show();
-            } else {
-                this.screen_container.but_active.hide();
-            }
-
             // Add common fields
             const common_fields = new Set([
                 ['id', Sao.i18n.gettext('ID'), 'integer'],
@@ -24146,8 +24160,7 @@ function eval_pyson(value){
                 }
             });
 
-            var readonly = (this.screen.attributes.readonly ||
-                    this.screen.group.readonly);
+            var readonly = this.screen.readonly || this.screen.group.readonly;
 
             this.but_ok = null;
             this.but_new = null;
@@ -24190,7 +24203,7 @@ function eval_pyson(value){
                 }));
             }
 
-            if (this.save_current) {
+            if (this.save_current && !readonly) {
                 this.but_ok = jQuery('<button/>', {
                     'class': 'btn btn-primary',
                     'type': 'submit',
@@ -24363,7 +24376,7 @@ function eval_pyson(value){
             var name = '_';
             var access = Sao.common.MODELACCESS.get(this.screen.model_name);
             var deletable = this.screen.deletable;
-            var readonly = this.screen.group.readonly || this.screen.readonly;
+            var readonly = this.screen.readonly || this.screen.group.readonly;
             if (position >= 1) {
                 name = position;
                 if (this.domain) {
@@ -24453,7 +24466,7 @@ function eval_pyson(value){
         response: function(response_id) {
             var result;
             this.screen.current_view.set_value();
-            var readonly = this.screen.group.readonly;
+            var readonly = this.screen.readonly || this.screen.group.readonly;
             if (~['RESPONSE_OK', 'RESPONSE_ACCEPT'].indexOf(response_id) &&
                     !readonly &&
                     this.screen.current_record) {
@@ -24931,7 +24944,7 @@ function eval_pyson(value){
     });
 
     Sao.Window.Revision = Sao.class_(Object, {
-        init: function(revisions, callback) {
+        init: function(revisions, revision, callback) {
             this.callback = callback;
             var dialog = new Sao.Dialog(
                     Sao.i18n.gettext('Revision'), '', 'lg');
@@ -24972,15 +24985,18 @@ function eval_pyson(value){
                 value: null,
                 text: ''
             }));
-            for (let revision of revisions) {
-                var name = revision[2];
-                revision = revision[0];
+            for (let rev of revisions) {
+                var name = rev[2];
+                rev = rev[0];
                 this.select.append(jQuery('<option/>', {
-                    value: revision.valueOf(),
+                    value: rev.valueOf(),
                     text: Sao.common.format_datetime(
-                        date_format + ' ' + time_format, revision) + ' ' + name,
+                        date_format + ' ' + time_format, rev) + ' ' + name,
                 }));
             }
+            if (revision) {
+                this.select.val(revision.valueOf());
+            }
             this.el.modal('show');
             this.el.on('hidden.bs.modal', function(event) {
                 jQuery(this).remove();