tryton-sao 6.2.6 → 6.2.9

package/CHANGELOG

@@ -1,3 +1,12 @@
+Version 6.2.9 - 2022-06-03
+* Bug fixes (see mercurial logs for details)
+
+Version 6.2.8 - 2022-05-06
+* Bug fixes (see mercurial logs for details)
+
+Version 6.2.7 - 2022-04-15
+* Bug fixes (see mercurial logs for details)
+
 Version 6.2.6 - 2022-03-01
 * Bug fixes (see mercurial logs for details)
 

package/Gruntfile.js

@@ -135,6 +135,7 @@ module.exports = function(grunt) {
     },
     qunit: {
         options: {
+            timeout: 300000,
             puppeteer: {
                 headless: true,
                 args: [

package/dist/tryton-sao.js

@@ -1251,7 +1251,7 @@ var Sao = {};
                     name = data.error[1][0];
                     msg = data.error[1][1];
                     description = data.error[1][2];
-                    Sao.common.userwarning.run(msg, description)
+                    Sao.common.userwarning.run(description, msg)
                         .then(function(result) {
                             if (!~['always', 'ok'].indexOf(result)) {
                                 dfd.reject();
@@ -2182,10 +2182,14 @@ var Sao = {};
     });
 
     Sao.PYSON.In.eval_ = function(value, context) {
-        if (value.v.indexOf) {
-            return Boolean(~value.v.indexOf(value.k));
+        if (value.v) {
+            if (value.v.indexOf) {
+                return Boolean(~value.v.indexOf(value.k));
+            } else {
+                return !!value.v[value.k];
+            }
         } else {
-            return !!value.v[value.k];
+            return false;
         }
     };
     Sao.PYSON.In.init_from_object = function(obj) {
@@ -3175,7 +3179,7 @@ var Sao = {};
     };
 
     Sao.common.parse_time = function(format, value) {
-        if (jQuery.isEmptyObject(value)) {
+        if (!value) {
             return null;
         }
         var getNumber = function(pattern) {
@@ -4242,7 +4246,7 @@ var Sao = {};
 
             var pslice = function(string, depth) {
                 if (depth > 0) {
-                    return string.substring(0, depth);
+                    return string.substring(0, string.length - depth);
                 }
                 return string;
             };
@@ -4352,8 +4356,8 @@ var Sao = {};
             }
             return results;
         },
-        is_leaf: function(element) {
-            return ((element instanceof Array) && element.clause);
+        is_subdomain: function(element) {
+            return (element instanceof Array) && !element.clause;
         },
         ending_clause: function(domain, depth) {
             if (depth === undefined) {
@@ -4363,7 +4367,7 @@ var Sao = {};
                 return [null, depth];
             }
             var last_element = domain[domain.length - 1];
-            if (!this.is_leaf(last_element)) {
+            if (this.is_subdomain(last_element)) {
                 return this.ending_clause(last_element, depth + 1);
             }
             return [last_element, depth];
@@ -4374,9 +4378,9 @@ var Sao = {};
             for (i = 0, len=domain.length - 1; i < len; i++) {
                 results.push(domain[i]);
             }
-            if (!this.is_leaf(domain[i])) {
-                results = results.concat(this.replace_ending_clause(domain[i],
-                            clause));
+            if (this.is_subdomain(domain[i])) {
+                results.push(
+                    this.replace_ending_clause(domain[i], clause));
             } else {
                 results.push(clause);
             }
@@ -4388,7 +4392,7 @@ var Sao = {};
             }
             var results = domain.slice(0, -1);
             var last_element = domain[domain.length - 1];
-            if (!this.is_leaf(last_element)) {
+            if (this.is_subdomain(last_element)) {
                 results.push(this.append_ending_clause(last_element, clause,
                             depth - 1));
             } else {
@@ -5129,19 +5133,17 @@ var Sao = {};
             }
         },
         simplify: function(value) {
-            if ((value instanceof Array) && !this.is_leaf(value)) {
-                if ((value.length == 1) && (value[0] instanceof Array) &&
-                        ((value[0][0] == 'AND') || (value[0][0] == 'OR') ||
-                         (value[0][0] instanceof Array))) {
+            if (this.is_subdomain(value)) {
+                if ((value.length == 1) && this.is_subdomain(value[0])) {
                     return this.simplify(value[0]);
                 } else if ((value.length == 2) &&
-                        ((value[0] == 'AND') || (value[0] == 'OR')) &&
-                        (value[1] instanceof Array)) {
+                    ((value[0] == 'AND') || (value[0] == 'OR')) &&
+                    this.is_subdomain(value[1])) {
                     return this.simplify(value[1]);
                 } else if ((value.length == 3) &&
-                        ((value[0] == 'AND') || (value[0] == 'OR')) &&
-                        (value[1] instanceof Array) &&
-                        (value[0] == value[1][0])) {
+                    ((value[0] == 'AND') || (value[0] == 'OR')) &&
+                    this.is_subdomain(value[1]) &&
+                    (value[0] == value[1][0])) {
                     value = this.simplify(value[1]).concat([value[2]]);
                 }
                 return value.map(this.simplify.bind(this));
@@ -6135,8 +6137,8 @@ var Sao = {};
             dialog.body.append(jQuery('<div/>', {
                 'class': 'checkbox',
             }).append(jQuery('<label/>')
-                .append(always)
-                .text(Sao.i18n.gettext('Always ignore this warning.')))
+                .text(Sao.i18n.gettext("Always ignore this warning."))
+                .prepend(always))
             );
             dialog.body.append(jQuery('<p/>')
                     .text(Sao.i18n.gettext('Do you want to proceed?')));
@@ -7783,7 +7785,7 @@ var Sao = {};
                     return;
                 }
             }
-            if (this.group.prm.state() == 'pending') {
+            if (async && this.group.prm.state() == 'pending') {
                 return this.group.prm.then(function() {
                     return this.load(name);
                 }.bind(this));
@@ -8134,10 +8136,11 @@ var Sao = {};
                 this.on_change_with(fieldnames);
                 var callback = function() {
                     if (display) {
-                        return this.group.root_group.screens
-                            .forEach(function(screen) {
+                        return jQuery.when.apply(
+                            jQuery, this.group.root_group.screens
+                            .map(function(screen) {
                                 return screen.display();
-                            });
+                            }));
                     }
                 }.bind(this);
                 if (validate) {
@@ -8938,10 +8941,8 @@ var Sao = {};
                         value = null;
                     }
                 } else if (value.isDate) {
-                    current_value = this.get(record);
-                    if (current_value) {
-                        value = Sao.DateTime.combine(value, current_value);
-                    }
+                    current_value = this.get(record) || Sao.Time();
+                    value = Sao.DateTime.combine(value, current_value);
                 }
             }
             Sao.field.DateTime._super.set_client.call(this, record, value,
@@ -9443,7 +9444,7 @@ var Sao = {};
             if (value instanceof Array) {
                 return this._set_value(record, value, false, true);
             }
-            if (value.add || value.update) {
+            if (value && (value.add || value.update)) {
                 var context = this.get_context(record);
                 fields = record._values[this.name].model.fields;
                 var new_field_names = {};
@@ -9483,7 +9484,7 @@ var Sao = {};
             }
 
             var group = record._values[this.name];
-            if (value.delete) {
+            if (value && value.delete) {
                 value.delete.forEach(function(record_id) {
                     var record2 = group.get(record_id);
                     if (record2) {
@@ -9491,7 +9492,7 @@ var Sao = {};
                     }
                 }.bind(this));
             }
-            if (value.remove) {
+            if (value && value.remove) {
                 value.remove.forEach(function(record_id) {
                     var record2 = group.get(record_id);
                     if (record2) {
@@ -9500,7 +9501,7 @@ var Sao = {};
                 }.bind(this));
             }
 
-            if (value.add || value.update) {
+            if (value && (value.add || value.update)) {
                 // First set already added fields to prevent triggering a
                 // second on_change call
                 if (value.update) {
@@ -10225,10 +10226,16 @@ var Sao = {};
                 this.buttons[item.id].click(item, function(event) {
                     var item = event.data;
                     var button = this.buttons[item.id];
-                    button.prop('disabled', true);
+                    // Use data instead of disabled prop because the action may
+                    // actually disable the button.
+                    if (button.data('disabled')) {
+                        event.preventDefault();
+                        return;
+                    }
+                    button.data('disabled', true);
                     (this[item.id](this) || jQuery.when())
                         .always(function() {
-                            button.prop('disabled', false);
+                            button.data('disabled', false);
                         });
                 }.bind(this));
             };
@@ -10671,13 +10678,14 @@ var Sao = {};
                         menu.children().length);
                 }
 
-                if (menu_action[0] == 'print') {
-                    if (toolbars.exports.length && toolbars.print.length) {
+                if ((menu_action[0] == 'print') &&
+                    toolbars.exports.length) {
+                    button._can_be_sensitive = true;
+                    if (toolbars.print.length) {
                         menu.append(jQuery('<li/>', {
                             'role': 'separator',
                             'class': 'divider',
                         }));
-                        button._can_be_sensitive = true;
                     }
                     toolbars.exports.forEach(function(export_) {
                         var item = jQuery('<li/>', {
@@ -12354,11 +12362,11 @@ var Sao = {};
                     var value = this._parse(this.format, date.val());
                     value = this._format(this.format, value);
                     date.val(value);
-                });
+                }.bind(this));
                 mousetrap.bind('=', function(e, combo) {
                     e.preventDefault();
                     date.val(this._format(this.format, moment()));
-                });
+                }.bind(this));
 
                 Sao.common.DATE_OPERATORS.forEach(function(operator) {
                     mousetrap.bind(operator[0], function(e, combo) {
@@ -16681,7 +16689,7 @@ function eval_pyson(value){
             if (this.has_target(value)) {
                 var m2o_id =
                     this.id_from_value(record.field_get(this.field_name));
-                if (evt && evt.ctrlKey) {
+                if (evt && (evt.ctrlKey || evt.metaKey)) {
                     var params = {};
                     params.model = this.get_model();
                     params.res_id = m2o_id;
@@ -18352,8 +18360,8 @@ function eval_pyson(value){
         },
         set_readonly: function(readonly) {
             Sao.View.Form.Image._super.set_readonly.call(this, readonly);
-            this.but_select.prop('disable', readonly);
-            this.but_clear.prop('disable', readonly);
+            this.but_select.prop('disabled', readonly);
+            this.but_clear.prop('disabled', readonly);
         },
         clear: function() {
             Sao.View.Form.Image._super.clear.call(this);
@@ -19868,7 +19876,7 @@ function eval_pyson(value){
 
             var parent_row = null;
             var dest_position;
-            if (evt.ctrlKey && this.children_field) {
+            if ((evt.ctrlKey || evt.metaKey) && this.children_field) {
                 parent_row = this._find_row(row.el.prev());
                 dest_position = (parent_row || this).rows.length;
             } else {
@@ -20185,8 +20193,6 @@ function eval_pyson(value){
             }
             this.table.css('min-width', 'calc(' + min_width.join(' + ') + ')');
             this.scrollbar.css('min-width', this.table.css('min-width'));
-            this.tbody.find('tr.more-row > td').attr(
-                'colspan', visible_columns);
 
             if (!this.table.hasClass('no-responsive') &
                 (this.columns.filter(function(c) {
@@ -20216,7 +20222,9 @@ function eval_pyson(value){
                     var more_row = jQuery('<tr/>', {
                         'class': 'more-row',
                     });
-                    var more_cell = jQuery('<td/>');
+                    var more_cell = jQuery('<td/>', {
+                        'colspan': visible_columns,
+                    });
                     var more_button = jQuery('<button/>', {
                         'class': 'btn btn-default btn-block',
                         'type': 'button',
@@ -21083,7 +21091,7 @@ function eval_pyson(value){
                     current_record = this.tree.screen.current_record;
                     this.tree.select_records(current_record, this.record);
                 } else {
-                    if (!event_.ctrlKey ||
+                    if (!(event_.ctrlKey || event_.metaKey) ||
                         this.tree.selection_mode ==
                         Sao.common.SELECTION_SINGLE) {
                         this.tree.select_records(null, null);
@@ -21277,7 +21285,7 @@ function eval_pyson(value){
 
             Sao.View.Tree.RowEditable._super.select_row.call(this, event_);
 
-            if (!event_.shiftKey && !event_.ctrlKey) {
+            if (!event_.shiftKey && !(event_.ctrlKey || event_.metaKey)) {
                 this.tree.edit_row(this);
             }
         },
@@ -23181,7 +23189,7 @@ function eval_pyson(value){
                 }
                 this.select_records(i, view_form_idx);
             } else {
-                if (!event_.ctrlKey) {
+                if (!(event_.ctrlKey || event_.metaKey)) {
                     this.select_records(null, null);
                 }
                 this.record = view_form.record;
@@ -24724,7 +24732,7 @@ function eval_pyson(value){
             }).text(el_field.attr('name')).prepend(
                 Sao.common.ICONFACTORY.get_icon_img('tryton-drag')
             ).click(function(e) {
-                if (e.ctrlKey) {
+                if (e.ctrlKey || e.metaKey) {
                     node.toggleClass('bg-primary');
                 } else {
                     jQuery(e.target).addClass('bg-primary')
@@ -24748,7 +24756,7 @@ function eval_pyson(value){
                     'field': parent_node[field].field,
                     'name': parent_node[field].name
                 }).text(name).click(function(e) {
-                    if(e.ctrlKey) {
+                    if (e.ctrlKey || e.metaKey) {
                         node.toggleClass('bg-primary');
                     } else {
                         this.fields_all.find('li').removeClass('bg-primary');
@@ -25107,7 +25115,7 @@ function eval_pyson(value){
                 var node = jQuery('<li/>', {
                     'path': path
                 }).text(parent_node[name].string).click(function(e) {
-                    if(e.ctrlKey) {
+                    if (e.ctrlKey || e.metaKey) {
                         node.toggleClass('bg-primary');
                     } else {
                         this.fields_all.find('li')
@@ -25356,7 +25364,7 @@ function eval_pyson(value){
                 'path': name,
                 'class': 'draggable-handle',
             }).text(long_string).click(function(e) {
-                if(e.ctrlKey) {
+                if (e.ctrlKey || e.metaKey) {
                     node.toggleClass('bg-primary');
                 } else {
                     jQuery(e.target).addClass('bg-primary')