tryton-sao 5.0.50 → 5.0.53

package/CHANGELOG

@@ -1,3 +1,12 @@
+Version 5.0.53 - 2022-06-03
+* Bug fixes (see mercurial logs for details)
+
+Version 5.0.52 - 2022-05-06
+* Bug fixes (see mercurial logs for details)
+
+Version 5.0.51 - 2022-04-15
+* Bug fixes (see mercurial logs for details)
+
 Version 5.0.50 - 2022-03-01
 * Bug fixes (see mercurial logs for details)
 

package/dist/tryton-sao.js

@@ -1187,7 +1187,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();
@@ -2072,10 +2072,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) {
@@ -4380,10 +4384,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,
@@ -4845,7 +4847,7 @@ var Sao = {};
                 return this._set_value(record, value, false, true);
             }
             var prm = jQuery.when();
-            if (value.add || value.update) {
+            if (value && (value.add || value.update)) {
                 var context = this.get_context(record);
                 var fields = record._values[this.name].model.fields;
                 var field_names = {};
@@ -4885,7 +4887,7 @@ var Sao = {};
                     to_remove.push(record2);
                 }
             });
-            if (value.remove) {
+            if (value && value.remove) {
                 value.remove.forEach(function(record_id) {
                     var record2 = group.get(record_id);
                     if (record2) {
@@ -4897,7 +4899,7 @@ var Sao = {};
                 group.remove(record2, false, true, false, false);
             }.bind(this));
 
-            if (value.add || value.update) {
+            if (value && (value.add || value.update)) {
                 prm = prm.then(function(fields) {
                     var promises = [];
                     group.add_fields(fields);
@@ -5586,10 +5588,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));
             };
@@ -11069,13 +11077,13 @@ 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;
                     params.mode = ['form'];
                     params.name = this.attributes.string;
-                    params.context = this.field.get_context(this.record);
+                    params.context = this.field().get_context(record);
                     Sao.Tab.create(params);
                     return;
                 }
@@ -12508,8 +12516,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);
@@ -14379,7 +14387,7 @@ function eval_pyson(value){
                 this.tree.select_changed(this.record);
                 this.switch_row();
             } else {
-                if (!event_.ctrlKey ||
+                if (!(event_.ctrlKey || event_.metaKey) ||
                         this.tree.selection_mode ==
                         Sao.common.SELECTION_SINGLE) {
                     this.tree.rows.forEach(function(row) {
@@ -16597,7 +16605,7 @@ function eval_pyson(value){
     };
 
     Sao.common.parse_time = function(format, value) {
-        if (jQuery.isEmptyObject(value)) {
+        if (!value) {
             return null;
         }
         var getNumber = function(pattern) {
@@ -17576,7 +17584,7 @@ function eval_pyson(value){
 
             var pslice = function(string, depth) {
                 if (depth > 0) {
-                    return string.substring(0, depth);
+                    return string.substring(0, string.length - depth);
                 }
                 return string;
             };
@@ -17686,8 +17694,8 @@ function eval_pyson(value){
             }
             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) {
@@ -17697,7 +17705,7 @@ function eval_pyson(value){
                 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];
@@ -17708,9 +17716,9 @@ function eval_pyson(value){
             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);
             }
@@ -17722,7 +17730,7 @@ function eval_pyson(value){
             }
             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 {
@@ -18441,19 +18449,17 @@ function eval_pyson(value){
             }
         },
         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));
@@ -19399,8 +19405,8 @@ function eval_pyson(value){
             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?')));
@@ -21260,7 +21266,7 @@ function eval_pyson(value){
             var node = jQuery('<li/>', {
                 'field': field,
             }).text(el_field.attr('name')).click(function(e) {
-                if (e.ctrlKey) {
+                if (e.ctrlKey || e.metaKey) {
                     node.toggleClass('bg-primary');
                 } else {
                     jQuery(e.target).addClass('bg-primary')
@@ -21284,7 +21290,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');
@@ -21579,7 +21585,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')
@@ -21857,7 +21863,7 @@ function eval_pyson(value){
             var node = jQuery('<li/>', {
                 'path': name,
             }).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')