tryton-sao 7.6.10 → 7.6.12

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.6.12 - 2025-12-17
+---------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.6.11 - 2025-11-21
+---------------------------
+* Bug fixes (see mercurial logs for details)
+* Escape completion content with custom format (issue14363)
+
 Version 7.6.10 - 2025-11-02
 ---------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.6.10',
+    __version__: '7.6.12',
 };
 /* eslint-enable no-redeclare */
 
@@ -4625,11 +4625,12 @@ var Sao = {
                 var name = clause[0];
                 var operator = clause[1];
                 var value = clause[2];
-                if (name.endsWith('.rec_name')) {
+                if (name.endsWith('.rec_name')
+                    && (value || (clause.length > 3))) {
                     name = name.slice(0, -9);
                 }
                 if (!(name in this.fields)) {
-                    if (this.is_full_text(value)) {
+                    if ((value !== null) && this.is_full_text(value)) {
                         value = value.slice(1, -1);
                     }
                     return this.quote(value);
@@ -5551,7 +5552,7 @@ var Sao = {
                         break;
                     }
                 }
-                return target + ',' + value;
+                return target + ',' + (value || '');
             };
 
             var converts = {
@@ -6975,7 +6976,10 @@ var Sao = {
             }).appendTo(dialog.body);
             alert_.append(jQuery('<h4/>')
                 .text(title)
-                .css('white-space', 'pre-wrap'));
+                .css({
+                    'white-space': 'pre-wrap',
+                    'word-break': 'break-all',
+                }));
             alert_.append(jQuery('<p/>').append(jQuery('<a/>', {
                 'class': 'btn btn-default',
                 role: 'button',
@@ -7181,9 +7185,13 @@ var Sao = {
         },
         _format: function(content) {
             if (this.format) {
-                return this.format(content);
+                content = this.format(content);
+            }
+            if (content instanceof jQuery) {
+                return content;
+            } else {
+                return jQuery('<span/>').text(content);
             }
-            return jQuery('<span/>').text(content);
         },
         _format_action: function(content) {
             if (this.format_action) {
@@ -8098,7 +8106,7 @@ var Sao = {
         array.save = function() {
             var deferreds = [];
             this.forEach(record => {
-                deferreds.push(record.save());
+                deferreds.push(record.save(false));
             });
             if (!jQuery.isEmptyObject(this.record_deleted)) {
                 for (const record of this.record_deleted) {
@@ -8381,7 +8389,7 @@ var Sao = {
                 return false;
             }
         },
-        save: function(force_reload=false) {
+        save: function(force_reload=true) {
             var context = this.get_context();
             if (this._save_prm.state() == 'pending') {
                 return this._save_prm.then(() => this.save(force_reload));
@@ -8804,7 +8812,7 @@ var Sao = {
                 this.on_change(fieldnames);
                 this.on_change_with(fieldnames);
                 if (validate) {
-                    return this.validate(null, true);
+                    this.validate(null, true);
                 }
                 if (modified) {
                     this.set_modified();
@@ -11220,7 +11228,7 @@ var Sao = {
             if (other.compare(attributes)) {
                 Sao.common.scrollIntoViewIfNeeded(
                     tablist.find('a[href="#' + other.id + '"]').tab('show'));
-                return;
+                return jQuery.when();
             }
         }
         var tab;
@@ -17312,7 +17320,7 @@ function eval_pyson(value){
         },
         get width() {
             var digits = this.digits;
-            if (digits) {
+            if (digits && digits.every(d => d !== null)) {
                 return digits.reduce(function(acc, cur) {
                     return acc + cur;
                 });
@@ -17960,15 +17968,21 @@ function eval_pyson(value){
             } else {
                 this._popup = true;
             }
+            let view_ids = (this.attributes.view_ids || '').split(',');
             if (this.has_target(value)) {
                 var m2o_id =
                     this.id_from_value(record.field_get(this.field_name));
                 if (evt && (evt.ctrlKey || evt.metaKey)) {
+                    if (!jQuery.isEmptyObject(view_ids)) {
+                        // Remove the first tree view as mode is form only
+                        view_ids.shift();
+                    }
                     var params = {};
                     params.model = this.get_model();
                     params.res_id = m2o_id;
                     params.mode = ['form'];
                     params.name = this.attributes.string;
+                    params.view_ids = view_ids;
                     params.context = this.field.get_context(this.record);
                     Sao.Tab.create(params);
                     this._popup = false;
@@ -18017,8 +18031,7 @@ function eval_pyson(value){
                             context: context,
                             domain: domain,
                             order: order,
-                            view_ids: (this.attributes.view_ids ||
-                                '').split(','),
+                            view_ids: view_ids,
                             views_preload: (this.attributes.views || {}),
                             new_: this.create_access,
                             search_filter: parser.quote(text),
@@ -23228,9 +23241,11 @@ function eval_pyson(value){
                 return;
             }
 
-            body = listener = jQuery(document.body);
+            body = jQuery(document.body);
             if (body.hasClass('modal-open')) {
                 listener = this.tree.el.parents('.modal').last();
+            } else {
+                listener = this.tree.el.parents('.tab-pane').last();
             }
             const handler = event_ => {
                 if ((event_.currentTarget == body[0]) &&
@@ -23243,7 +23258,7 @@ function eval_pyson(value){
                     event_.stopPropagation();
                     return;
                 }
-                body.off('click.sao.editabletree');
+                listener.off('click.sao.editabletree');
                 this.tree.edit_row(null);
                 return true;
             };
@@ -23372,7 +23387,10 @@ function eval_pyson(value){
                             }
                         }
                         this._get_column_td(next_column)
-                            .find(':input,[tabindex=0]').focus();
+                            .find(':input,[tabindex=0]')
+                            .filter(':visible')
+                            .first()
+                            .focus();
                     } else {
                         var prm = jQuery.when();
                         if (!this.tree.screen.group.parent) {
@@ -23421,7 +23439,10 @@ function eval_pyson(value){
                                 this._get_column_td(
                                     next_column, next_row)
                                     .trigger('click')
+                                    .trigger('click')
                                     .find(':input,[tabindex=0]')
+                                    .filter(':visible')
+                                    .first()
                                     .focus();
                             });
                         }
@@ -23775,12 +23796,18 @@ function eval_pyson(value){
             cell = cell.children('a');
             cell.unbind('click');
             Sao.View.Tree.Many2OneColumn._super.update_text.call(this, cell, record);
+            let view_ids = (this.attributes.view_ids || '').split(',');
+            if (!jQuery.isEmptyObject(view_ids)) {
+                // Remove the first tree view as mode is form only
+                view_ids.shift();
+            }
             cell.click(event => {
                 event.stopPropagation();
                 var params = {};
                 params.model = this.attributes.relation;
                 params.res_id = this.field.get(record);
                 params.mode = ['form'];
+                params.view_ids = view_ids;
                 params.name = this.attributes.string;
                 params.context = this.field.get_context(record);
                 Sao.Tab.create(params);
@@ -24703,7 +24730,7 @@ function eval_pyson(value){
         },
         action: function(data, element) {
             var ids = this.ids[this._action_key(data)];
-            var ctx = jQuery.extend({}, this.view.screen.group._context);
+            var ctx = jQuery.extend({}, this.view.screen.group.local_context);
             delete ctx.active_ids;
             delete ctx.active_id;
             Sao.Action.exec_keyword('graph_open', {
@@ -24824,7 +24851,8 @@ function eval_pyson(value){
             Sao.View.Graph.Pie._super._add_id.call(this, key, id);
         },
         _action_key: function(data) {
-            return data.id;
+            // data.name is the label used for the x axis
+            return data.name;
         }
     });
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.6.10",
+  "version": "7.6.12",
   "homepage": "https://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/common.js

@@ -1276,11 +1276,12 @@
                 var name = clause[0];
                 var operator = clause[1];
                 var value = clause[2];
-                if (name.endsWith('.rec_name')) {
+                if (name.endsWith('.rec_name')
+                    && (value || (clause.length > 3))) {
                     name = name.slice(0, -9);
                 }
                 if (!(name in this.fields)) {
-                    if (this.is_full_text(value)) {
+                    if ((value !== null) && this.is_full_text(value)) {
                         value = value.slice(1, -1);
                     }
                     return this.quote(value);
@@ -2202,7 +2203,7 @@
                         break;
                     }
                 }
-                return target + ',' + value;
+                return target + ',' + (value || '');
             };
 
             var converts = {
@@ -3626,7 +3627,10 @@
             }).appendTo(dialog.body);
             alert_.append(jQuery('<h4/>')
                 .text(title)
-                .css('white-space', 'pre-wrap'));
+                .css({
+                    'white-space': 'pre-wrap',
+                    'word-break': 'break-all',
+                }));
             alert_.append(jQuery('<p/>').append(jQuery('<a/>', {
                 'class': 'btn btn-default',
                 role: 'button',
@@ -3832,9 +3836,13 @@
         },
         _format: function(content) {
             if (this.format) {
-                return this.format(content);
+                content = this.format(content);
+            }
+            if (content instanceof jQuery) {
+                return content;
+            } else {
+                return jQuery('<span/>').text(content);
             }
-            return jQuery('<span/>').text(content);
         },
         _format_action: function(content) {
             if (this.format_action) {

package/src/model.js

@@ -315,7 +315,7 @@
         array.save = function() {
             var deferreds = [];
             this.forEach(record => {
-                deferreds.push(record.save());
+                deferreds.push(record.save(false));
             });
             if (!jQuery.isEmptyObject(this.record_deleted)) {
                 for (const record of this.record_deleted) {
@@ -598,7 +598,7 @@
                 return false;
             }
         },
-        save: function(force_reload=false) {
+        save: function(force_reload=true) {
             var context = this.get_context();
             if (this._save_prm.state() == 'pending') {
                 return this._save_prm.then(() => this.save(force_reload));
@@ -1021,7 +1021,7 @@
                 this.on_change(fieldnames);
                 this.on_change_with(fieldnames);
                 if (validate) {
-                    return this.validate(null, true);
+                    this.validate(null, true);
                 }
                 if (modified) {
                     this.set_modified();

package/src/sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.6.10',
+    __version__: '7.6.12',
 };
 /* eslint-enable no-redeclare */
 

package/src/tab.js

@@ -424,7 +424,7 @@
             if (other.compare(attributes)) {
                 Sao.common.scrollIntoViewIfNeeded(
                     tablist.find('a[href="#' + other.id + '"]').tab('show'));
-                return;
+                return jQuery.when();
             }
         }
         var tab;

package/src/view/form.js

@@ -2204,7 +2204,7 @@ function eval_pyson(value){
         },
         get width() {
             var digits = this.digits;
-            if (digits) {
+            if (digits && digits.every(d => d !== null)) {
                 return digits.reduce(function(acc, cur) {
                     return acc + cur;
                 });
@@ -2852,15 +2852,21 @@ function eval_pyson(value){
             } else {
                 this._popup = true;
             }
+            let view_ids = (this.attributes.view_ids || '').split(',');
             if (this.has_target(value)) {
                 var m2o_id =
                     this.id_from_value(record.field_get(this.field_name));
                 if (evt && (evt.ctrlKey || evt.metaKey)) {
+                    if (!jQuery.isEmptyObject(view_ids)) {
+                        // Remove the first tree view as mode is form only
+                        view_ids.shift();
+                    }
                     var params = {};
                     params.model = this.get_model();
                     params.res_id = m2o_id;
                     params.mode = ['form'];
                     params.name = this.attributes.string;
+                    params.view_ids = view_ids;
                     params.context = this.field.get_context(this.record);
                     Sao.Tab.create(params);
                     this._popup = false;
@@ -2909,8 +2915,7 @@ function eval_pyson(value){
                             context: context,
                             domain: domain,
                             order: order,
-                            view_ids: (this.attributes.view_ids ||
-                                '').split(','),
+                            view_ids: view_ids,
                             views_preload: (this.attributes.views || {}),
                             new_: this.create_access,
                             search_filter: parser.quote(text),

package/src/view/graph.js

@@ -241,7 +241,7 @@
         },
         action: function(data, element) {
             var ids = this.ids[this._action_key(data)];
-            var ctx = jQuery.extend({}, this.view.screen.group._context);
+            var ctx = jQuery.extend({}, this.view.screen.group.local_context);
             delete ctx.active_ids;
             delete ctx.active_id;
             Sao.Action.exec_keyword('graph_open', {
@@ -362,7 +362,8 @@
             Sao.View.Graph.Pie._super._add_id.call(this, key, id);
         },
         _action_key: function(data) {
-            return data.id;
+            // data.name is the label used for the x axis
+            return data.name;
         }
     });
 

package/src/view/tree.js

@@ -2203,9 +2203,11 @@
                 return;
             }
 
-            body = listener = jQuery(document.body);
+            body = jQuery(document.body);
             if (body.hasClass('modal-open')) {
                 listener = this.tree.el.parents('.modal').last();
+            } else {
+                listener = this.tree.el.parents('.tab-pane').last();
             }
             const handler = event_ => {
                 if ((event_.currentTarget == body[0]) &&
@@ -2218,7 +2220,7 @@
                     event_.stopPropagation();
                     return;
                 }
-                body.off('click.sao.editabletree');
+                listener.off('click.sao.editabletree');
                 this.tree.edit_row(null);
                 return true;
             };
@@ -2347,7 +2349,10 @@
                             }
                         }
                         this._get_column_td(next_column)
-                            .find(':input,[tabindex=0]').focus();
+                            .find(':input,[tabindex=0]')
+                            .filter(':visible')
+                            .first()
+                            .focus();
                     } else {
                         var prm = jQuery.when();
                         if (!this.tree.screen.group.parent) {
@@ -2396,7 +2401,10 @@
                                 this._get_column_td(
                                     next_column, next_row)
                                     .trigger('click')
+                                    .trigger('click')
                                     .find(':input,[tabindex=0]')
+                                    .filter(':visible')
+                                    .first()
                                     .focus();
                             });
                         }
@@ -2750,12 +2758,18 @@
             cell = cell.children('a');
             cell.unbind('click');
             Sao.View.Tree.Many2OneColumn._super.update_text.call(this, cell, record);
+            let view_ids = (this.attributes.view_ids || '').split(',');
+            if (!jQuery.isEmptyObject(view_ids)) {
+                // Remove the first tree view as mode is form only
+                view_ids.shift();
+            }
             cell.click(event => {
                 event.stopPropagation();
                 var params = {};
                 params.model = this.attributes.relation;
                 params.res_id = this.field.get(record);
                 params.mode = ['form'];
+                params.view_ids = view_ids;
                 params.name = this.attributes.string;
                 params.context = this.field.get_context(record);
                 Sao.Tab.create(params);

package/tests/sao.js

@@ -2040,6 +2040,9 @@
         [[c(['Reference', null, 'Spam,bar'])], [
             c(['reference.rec_name', 'ilike', '%bar%', 'spam'])
             ]],
+        [[c(['Reference', null, 'Spam,'])], [
+            c(['reference.rec_name', 'ilike', '%', 'spam'])
+            ]],
         [[c(['Reference', null, ['foo', 'bar']])], [
             c(['reference', 'in', ['foo', 'bar']])
             ]],
@@ -2368,6 +2371,7 @@
         [[['multiselection', 'not in', ['foo', 'bar']]], "MultiSelection: !Foo;Bar"],
         [[['reference', 'ilike', '%foo%']], 'Reference: foo'],
         [[['reference', 'ilike', '%bar%', 'spam']], 'Reference: Spam,bar'],
+        [[['reference.rec_name', '=', null, 'spam']], 'Reference: =Spam,'],
         [[['reference', 'in', ['foo', 'bar']]], 'Reference: foo;bar'],
         [[['many2one', 'ilike', '%John%']], 'Many2One: John'],
         [[['many2one.rec_name', 'in', ['John', 'Jane']]], 'Many2One: John;Jane'],