tryton-sao 7.2.2 → 7.2.4

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.2.4 - 2024-07-17
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.2.3 - 2024-07-01
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.2.2 - 2024-06-15
 --------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.css

@@ -10066,10 +10066,14 @@ img.icon {
   min-height: 150px;
   max-height: 300px;
 }
-.form .form-text textarea,
-.form .form-richtext textarea,
-.form .form-text .richtext,
-.form .form-richtext .richtext {
+.form .form-text .input-group,
+.form .form-richtext .input-group {
+  width: 100%;
+}
+.form .form-text .input-group textarea,
+.form .form-richtext .input-group textarea,
+.form .form-text .input-group .richtext,
+.form .form-richtext .input-group .richtext {
   height: 100%;
   line-height: 2.5ex;
   min-height: 12.5ex;

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.2.2',
+    __version__: '7.2.4',
 };
 /* eslint-enable no-redeclare */
 
@@ -107,6 +107,35 @@ var Sao = {
         };
     }
 
+    if (!Set.prototype.intersection) {
+        Set.prototype.intersection = function(other) {
+            if (this === null) {
+                throw new TypeError();
+            }
+            const result = new Set();
+            for (const key of other.keys()) {
+                if (this.has(key)) {
+                    result.add(key)
+                }
+            }
+            return result;
+        }
+    }
+
+    if (!Set.prototype.isSubsetOf) {
+        Set.prototype.isSubsetOf = function(other) {
+            if (this === null) {
+                throw new TypeError();
+            }
+            for (const key of this.keys()) {
+                if (!other.has(key)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
     Sao.setdefault = function(object, key, value) {
         if (!Object.prototype.hasOwnProperty.call(object, key)) {
             object[key] = value;
@@ -8290,6 +8319,7 @@ var Sao = {
                 views = this.model.fields[name].views;
             }
             var fields = {};
+            var views_operator;
             if (loading == 'eager') {
                 for (fname in this.model.fields) {
                     field = this.model.fields[fname];
@@ -8297,17 +8327,19 @@ var Sao = {
                         fields[fname] = field;
                     }
                 }
+                views_operator = views.isSubsetOf.bind(views);
             } else {
                 fields = this.model.fields;
+                views_operator = function(view) {
+                    return Boolean(this.intersection(view).size);
+                }.bind(views);
             }
             var fnames = [];
             for (fname in fields) {
                 field = fields[fname];
                 if (!(fname in this._loaded) &&
                     (!views.size ||
-                        Sao.common.intersect(
-                            Array.from(views).sort(),
-                            Array.from(field.views).sort()))) {
+                        views_operator(new Set(field.views)))) {
                     fnames.push(fname);
                 }
             }
@@ -10765,7 +10797,9 @@ var Sao = {
                     this.menu_buttons[item.id] = menuitem;
                     link.click(evt => {
                         evt.preventDefault();
-                        this[item.id]();
+                        if (!menuitem.hasClass('disabled')) {
+                            this[item.id]();
+                        }
                     });
                 } else if (!item && previous) {
                     menuitem = jQuery('<li/>', {
@@ -11861,7 +11895,7 @@ var Sao = {
                 this.refresh_resources(true);
             });
             for (const file of files) {
-                Sao.common.get_file_data(file, window_.add_data);
+                Sao.common.get_file_data(file, window_.add_data.bind(window_));
             }
             jQuery.when.apply(jQuery, uris).then(function() {
                 function empty(value) {
@@ -13115,9 +13149,7 @@ var Sao = {
             this.views = [];
             this.views_preload = attributes.views_preload || {};
             this.exclude_field = attributes.exclude_field;
-            this.new_group(attributes.context || {});
             this.current_view = null;
-            this.current_record = null;
             this.domain = attributes.domain || [];
             this.context_domain = attributes.context_domain;
             this.size_limit = null;
@@ -13129,11 +13161,14 @@ var Sao = {
             this._current_domain = [];
             this.offset = 0;
             this.order = this.default_order = attributes.order;
+            this.readonly = this.attributes.readonly || false;
             var access = Sao.common.MODELACCESS.get(model_name);
             if (!(access.write || access.create)) {
-                this.attributes.readonly = true;
+                this.readonly = true;
             }
             this.search_count = 0;
+            this.new_group(attributes.context || {});
+            this.current_record = null;
             this.screen_container = new Sao.ScreenContainer(
                 attributes.tab_domain);
             this.breadcrumb = attributes.breadcrumb || [];
@@ -13176,7 +13211,10 @@ var Sao = {
             var readonly_records = this.selected_records.some(function(r) {
                 return r.readonly;
             });
-            return this.attributes.readonly || readonly_records;
+            return this.__readonly || readonly_records;
+        },
+        set readonly(value) {
+            this.__readonly = value;
         },
         get deletable() {
             return this.selected_records.every(function(r) {
@@ -13554,7 +13592,7 @@ var Sao = {
                 context = this.context;
             }
             var group = new Sao.Group(this.model, context, []);
-            group.readonly = this.attributes.readonly;
+            group.readonly = this.__readonly;
             this.set_group(group);
         },
         record_modified: function(display=true) {
@@ -21183,7 +21221,7 @@ function eval_pyson(value){
         },
         display: function(selected, expanded) {
             var current_record = this.record;
-            if (jQuery.isEmptyObject(selected)) {
+            if (jQuery.isEmptyObject(selected) && current_record) {
                 selected = this.get_selected_paths();
                 if (this.selection.prop('checked') &&
                     !this.selection.prop('indeterminate')) {
@@ -21192,16 +21230,12 @@ function eval_pyson(value){
                         selected.push([record.id]);
                     }
                 } else {
-                    if (current_record) {
-                        var current_path = current_record.get_path(this.group);
-                        current_path = current_path.map(function(e) {
-                            return e[1];
-                        });
-                        if (!Sao.common.contains(selected, current_path)) {
-                            selected = [current_path];
-                        }
-                    } else if (!current_record) {
-                        selected = [];
+                    var current_path = current_record.get_path(this.group);
+                    current_path = current_path.map(function(e) {
+                        return e[1];
+                    });
+                    if (!Sao.common.contains(selected, current_path)) {
+                        selected = [current_path];
                     }
                 }
             }
@@ -21782,7 +21816,10 @@ function eval_pyson(value){
                         if (this.editable && new_) {
                             td.trigger('click');
                         }
-                        td.find(':input,[tabindex=0]').focus();
+                        var child = Sao.common.find_focusable_child(td);
+                        if (child) {
+                            child.focus();
+                        }
                     }
                 }
             };
@@ -24400,17 +24437,26 @@ function eval_pyson(value){
             if (!this.start && !this.end) {
                 return [['id', '=', -1]];
             }
-            var first_datetime = Sao.DateTime(this.start);
-            var last_datetime = Sao.DateTime(this.end);
+            var start = Sao.DateTime(this.start);
+            var end = Sao.DateTime(this.end);
             var dtstart = this.attributes.dtstart;
             var dtend = this.attributes.dtend || dtstart;
-            return ['OR',
-                    ['AND', [dtstart, '>=', first_datetime],
-                        [dtstart,  '<',  last_datetime]],
-                    ['AND', [dtend, '>=', first_datetime],
-                        [dtend, '<', last_datetime]],
-                    ['AND',  [dtstart, '<', first_datetime],
-                        [dtend, '>', last_datetime]]];
+            var fields = this.screen.model.fields;
+            if (fields[dtstart].description.type == 'date') {
+                start = start.todate();
+            }
+            if (fields[dtend].description.type == 'date') {
+                end = end.todate();
+            }
+            return [
+                [dtstart, '!=', null],
+                [dtend, '!=', null],
+                ['OR',
+                    ['AND', [dtstart, '>=', start], [dtstart,  '<', end]],
+                    ['AND', [dtend, '>=', start], [dtend, '<', end]],
+                    ['AND',  [dtstart, '<', start], [dtend, '>', end]],
+                ],
+            ];
         },
         get_displayed_period: function(){
             var DatesPeriod = [];
@@ -25045,7 +25091,7 @@ function eval_pyson(value){
                 }
             });
 
-            var readonly = this.screen.readonly || this.screen.group.readonly;
+            var readonly = this.screen.group.readonly;
 
             this.but_ok = null;
             this.but_new = null;
@@ -25272,7 +25318,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.readonly || this.screen.group.readonly;
+            var readonly = this.screen.group.readonly;
             if (position >= 1) {
                 name = position;
                 if (this.domain) {
@@ -25280,10 +25326,12 @@ function eval_pyson(value){
                 }
                 this.but_next.prop('disabled', position >= size);
                 this.but_previous.prop('disabled', position <= 1);
-                if (access.delete && !readonly && deletable) {
-                    this.but_del.prop('disabled', false);
-                    this.but_undel.prop('disabled', false);
-                }
+                this.but_del.prop(
+                    'disabled',
+                    readonly ||
+                    !access.delete ||
+                    !deletable);
+                this.but_undel.prop('disabled', readonly);
             } else {
                 this.but_del.prop('disabled', true);
                 this.but_undel.prop('disabled', true);
@@ -25356,7 +25404,7 @@ function eval_pyson(value){
         response: function(response_id) {
             var result;
             this.screen.current_view.set_value();
-            var readonly = this.screen.readonly || this.screen.group.readonly;
+            var readonly = this.screen.group.readonly;
             if (~['RESPONSE_OK', 'RESPONSE_ACCEPT'].indexOf(response_id) &&
                     !readonly &&
                     this.screen.current_record) {
@@ -25784,8 +25832,14 @@ function eval_pyson(value){
             this.title = title;
             this.exclude_field = kwargs.exclude_field || null;
             var dialog = new Sao.Dialog(Sao.i18n.gettext(
-                'Search %1', this.title), '', 'lg');
+                'Search %1', this.title), '', 'lg', false);
             this.el = dialog.modal;
+            this.el.on('keydown', e => {
+                if (e.which == Sao.common.ESC_KEYCODE) {
+                    e.preventDefault();
+                    this.response('RESPONSE_CANCEL');
+                }
+            });
 
             jQuery('<button/>', {
                 'class': 'btn btn-link',
@@ -25861,7 +25915,8 @@ function eval_pyson(value){
             if (response_id == 'RESPONSE_OK') {
                 records = this.screen.current_view.selected_records;
             } else if (response_id == 'RESPONSE_APPLY') {
-                this.screen.search_filter();
+                this.screen.search_filter(
+                    this.screen.screen_container.get_text());
                 return;
             } else if (response_id == 'RESPONSE_ACCEPT') {
                 var view_ids = jQuery.extend([], this.view_ids);
@@ -27932,7 +27987,8 @@ function eval_pyson(value){
                 }
                 if (!dialog ||
                     !this.model ||
-                    (Sao.main_menu_screen.model_name == this.model)) {
+                    (Sao.main_menu_screen &&
+                    (Sao.main_menu_screen.model_name == this.model))) {
                     is_menu = true;
                     screen = Sao.main_menu_screen;
                 } else {

package/package.json

@@ -2,7 +2,7 @@
   "name": "tryton-sao",
   "title": "sao",
   "description": "Tryton webclient",
-  "version": "7.2.2",
+  "version": "7.2.4",
   "homepage": "http://www.tryton.org/",
   "author": {
     "name": "Tryton"

package/src/model.js

@@ -681,6 +681,7 @@
                 views = this.model.fields[name].views;
             }
             var fields = {};
+            var views_operator;
             if (loading == 'eager') {
                 for (fname in this.model.fields) {
                     field = this.model.fields[fname];
@@ -688,17 +689,19 @@
                         fields[fname] = field;
                     }
                 }
+                views_operator = views.isSubsetOf.bind(views);
             } else {
                 fields = this.model.fields;
+                views_operator = function(view) {
+                    return Boolean(this.intersection(view).size);
+                }.bind(views);
             }
             var fnames = [];
             for (fname in fields) {
                 field = fields[fname];
                 if (!(fname in this._loaded) &&
                     (!views.size ||
-                        Sao.common.intersect(
-                            Array.from(views).sort(),
-                            Array.from(field.views).sort()))) {
+                        views_operator(new Set(field.views)))) {
                     fnames.push(fname);
                 }
             }

package/src/sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.2.2',
+    __version__: '7.2.4',
 };
 /* eslint-enable no-redeclare */
 
@@ -107,6 +107,35 @@ var Sao = {
         };
     }
 
+    if (!Set.prototype.intersection) {
+        Set.prototype.intersection = function(other) {
+            if (this === null) {
+                throw new TypeError();
+            }
+            const result = new Set();
+            for (const key of other.keys()) {
+                if (this.has(key)) {
+                    result.add(key)
+                }
+            }
+            return result;
+        }
+    }
+
+    if (!Set.prototype.isSubsetOf) {
+        Set.prototype.isSubsetOf = function(other) {
+            if (this === null) {
+                throw new TypeError();
+            }
+            for (const key of this.keys()) {
+                if (!other.has(key)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
     Sao.setdefault = function(object, key, value) {
         if (!Object.prototype.hasOwnProperty.call(object, key)) {
             object[key] = value;

package/src/sao.less

@@ -876,12 +876,16 @@ img.icon {
         }
     }
     .form-text, .form-richtext {
-        textarea, .richtext {
-            height: 100%;
-            line-height: 2.5ex;
-            min-height: 12.5ex;
-            overflow: auto;
-            resize: vertical;
+        .input-group {
+            width: 100%;
+
+            textarea, .richtext {
+                height: 100%;
+                line-height: 2.5ex;
+                min-height: 12.5ex;
+                overflow: auto;
+                resize: vertical;
+            }
         }
     }
     .form-richtext {

package/src/screen.js

@@ -794,9 +794,7 @@
             this.views = [];
             this.views_preload = attributes.views_preload || {};
             this.exclude_field = attributes.exclude_field;
-            this.new_group(attributes.context || {});
             this.current_view = null;
-            this.current_record = null;
             this.domain = attributes.domain || [];
             this.context_domain = attributes.context_domain;
             this.size_limit = null;
@@ -808,11 +806,14 @@
             this._current_domain = [];
             this.offset = 0;
             this.order = this.default_order = attributes.order;
+            this.readonly = this.attributes.readonly || false;
             var access = Sao.common.MODELACCESS.get(model_name);
             if (!(access.write || access.create)) {
-                this.attributes.readonly = true;
+                this.readonly = true;
             }
             this.search_count = 0;
+            this.new_group(attributes.context || {});
+            this.current_record = null;
             this.screen_container = new Sao.ScreenContainer(
                 attributes.tab_domain);
             this.breadcrumb = attributes.breadcrumb || [];
@@ -855,7 +856,10 @@
             var readonly_records = this.selected_records.some(function(r) {
                 return r.readonly;
             });
-            return this.attributes.readonly || readonly_records;
+            return this.__readonly || readonly_records;
+        },
+        set readonly(value) {
+            this.__readonly = value;
         },
         get deletable() {
             return this.selected_records.every(function(r) {
@@ -1233,7 +1237,7 @@
                 context = this.context;
             }
             var group = new Sao.Group(this.model, context, []);
-            group.readonly = this.attributes.readonly;
+            group.readonly = this.__readonly;
             this.set_group(group);
         },
         record_modified: function(display=true) {

package/src/tab.js

@@ -158,7 +158,9 @@
                     this.menu_buttons[item.id] = menuitem;
                     link.click(evt => {
                         evt.preventDefault();
-                        this[item.id]();
+                        if (!menuitem.hasClass('disabled')) {
+                            this[item.id]();
+                        }
                     });
                 } else if (!item && previous) {
                     menuitem = jQuery('<li/>', {
@@ -1254,7 +1256,7 @@
                 this.refresh_resources(true);
             });
             for (const file of files) {
-                Sao.common.get_file_data(file, window_.add_data);
+                Sao.common.get_file_data(file, window_.add_data.bind(window_));
             }
             jQuery.when.apply(jQuery, uris).then(function() {
                 function empty(value) {

package/src/view/calendar.js

@@ -346,17 +346,26 @@
             if (!this.start && !this.end) {
                 return [['id', '=', -1]];
             }
-            var first_datetime = Sao.DateTime(this.start);
-            var last_datetime = Sao.DateTime(this.end);
+            var start = Sao.DateTime(this.start);
+            var end = Sao.DateTime(this.end);
             var dtstart = this.attributes.dtstart;
             var dtend = this.attributes.dtend || dtstart;
-            return ['OR',
-                    ['AND', [dtstart, '>=', first_datetime],
-                        [dtstart,  '<',  last_datetime]],
-                    ['AND', [dtend, '>=', first_datetime],
-                        [dtend, '<', last_datetime]],
-                    ['AND',  [dtstart, '<', first_datetime],
-                        [dtend, '>', last_datetime]]];
+            var fields = this.screen.model.fields;
+            if (fields[dtstart].description.type == 'date') {
+                start = start.todate();
+            }
+            if (fields[dtend].description.type == 'date') {
+                end = end.todate();
+            }
+            return [
+                [dtstart, '!=', null],
+                [dtend, '!=', null],
+                ['OR',
+                    ['AND', [dtstart, '>=', start], [dtstart,  '<', end]],
+                    ['AND', [dtend, '>=', start], [dtend, '<', end]],
+                    ['AND',  [dtstart, '<', start], [dtend, '>', end]],
+                ],
+            ];
         },
         get_displayed_period: function(){
             var DatesPeriod = [];

package/src/view/tree.js

@@ -728,7 +728,7 @@
         },
         display: function(selected, expanded) {
             var current_record = this.record;
-            if (jQuery.isEmptyObject(selected)) {
+            if (jQuery.isEmptyObject(selected) && current_record) {
                 selected = this.get_selected_paths();
                 if (this.selection.prop('checked') &&
                     !this.selection.prop('indeterminate')) {
@@ -737,16 +737,12 @@
                         selected.push([record.id]);
                     }
                 } else {
-                    if (current_record) {
-                        var current_path = current_record.get_path(this.group);
-                        current_path = current_path.map(function(e) {
-                            return e[1];
-                        });
-                        if (!Sao.common.contains(selected, current_path)) {
-                            selected = [current_path];
-                        }
-                    } else if (!current_record) {
-                        selected = [];
+                    var current_path = current_record.get_path(this.group);
+                    current_path = current_path.map(function(e) {
+                        return e[1];
+                    });
+                    if (!Sao.common.contains(selected, current_path)) {
+                        selected = [current_path];
                     }
                 }
             }
@@ -1327,7 +1323,10 @@
                         if (this.editable && new_) {
                             td.trigger('click');
                         }
-                        td.find(':input,[tabindex=0]').focus();
+                        var child = Sao.common.find_focusable_child(td);
+                        if (child) {
+                            child.focus();
+                        }
                     }
                 }
             };

package/src/window.js

@@ -179,7 +179,7 @@
                 }
             });
 
-            var readonly = this.screen.readonly || this.screen.group.readonly;
+            var readonly = this.screen.group.readonly;
 
             this.but_ok = null;
             this.but_new = null;
@@ -406,7 +406,7 @@
             var name = '_';
             var access = Sao.common.MODELACCESS.get(this.screen.model_name);
             var deletable = this.screen.deletable;
-            var readonly = this.screen.readonly || this.screen.group.readonly;
+            var readonly = this.screen.group.readonly;
             if (position >= 1) {
                 name = position;
                 if (this.domain) {
@@ -414,10 +414,12 @@
                 }
                 this.but_next.prop('disabled', position >= size);
                 this.but_previous.prop('disabled', position <= 1);
-                if (access.delete && !readonly && deletable) {
-                    this.but_del.prop('disabled', false);
-                    this.but_undel.prop('disabled', false);
-                }
+                this.but_del.prop(
+                    'disabled',
+                    readonly ||
+                    !access.delete ||
+                    !deletable);
+                this.but_undel.prop('disabled', readonly);
             } else {
                 this.but_del.prop('disabled', true);
                 this.but_undel.prop('disabled', true);
@@ -490,7 +492,7 @@
         response: function(response_id) {
             var result;
             this.screen.current_view.set_value();
-            var readonly = this.screen.readonly || this.screen.group.readonly;
+            var readonly = this.screen.group.readonly;
             if (~['RESPONSE_OK', 'RESPONSE_ACCEPT'].indexOf(response_id) &&
                     !readonly &&
                     this.screen.current_record) {
@@ -918,8 +920,14 @@
             this.title = title;
             this.exclude_field = kwargs.exclude_field || null;
             var dialog = new Sao.Dialog(Sao.i18n.gettext(
-                'Search %1', this.title), '', 'lg');
+                'Search %1', this.title), '', 'lg', false);
             this.el = dialog.modal;
+            this.el.on('keydown', e => {
+                if (e.which == Sao.common.ESC_KEYCODE) {
+                    e.preventDefault();
+                    this.response('RESPONSE_CANCEL');
+                }
+            });
 
             jQuery('<button/>', {
                 'class': 'btn btn-link',
@@ -995,7 +1003,8 @@
             if (response_id == 'RESPONSE_OK') {
                 records = this.screen.current_view.selected_records;
             } else if (response_id == 'RESPONSE_APPLY') {
-                this.screen.search_filter();
+                this.screen.search_filter(
+                    this.screen.screen_container.get_text());
                 return;
             } else if (response_id == 'RESPONSE_ACCEPT') {
                 var view_ids = jQuery.extend([], this.view_ids);

package/src/wizard.js

@@ -316,7 +316,8 @@
                 }
                 if (!dialog ||
                     !this.model ||
-                    (Sao.main_menu_screen.model_name == this.model)) {
+                    (Sao.main_menu_screen &&
+                    (Sao.main_menu_screen.model_name == this.model))) {
                     is_menu = true;
                     screen = Sao.main_menu_screen;
                 } else {