tryton-sao 7.2.4 → 7.2.6

package/CHANGELOG

@@ -1,4 +1,14 @@
 
+Version 7.2.6 - 2024-09-01
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
+Version 7.2.5 - 2024-08-01
+--------------------------
+* Bug fixes (see mercurial logs for details)
+
+
 Version 7.2.4 - 2024-07-17
 --------------------------
 * Bug fixes (see mercurial logs for details)

package/dist/tryton-sao.css

@@ -9342,12 +9342,6 @@ html[theme="default"] .carousel-caption h6 {
   display: flex;
   flex: 1;
 }
-@media screen and (max-width: 767px) {
-  #tabcontent > .tab-pane > .panel > .panel-body {
-    flex-direction: column-reverse;
-    min-height: unset;
-  }
-}
 #tabcontent[data-view-type="tree"] {
   display: flex;
   flex: 1;
@@ -9679,9 +9673,7 @@ img.icon {
   border-style: solid;
   border-width: 0 0 0 1px;
   flex: 1;
-  margin-left: 5px;
-  min-width: 20%;
-  overflow: auto;
+  overflow: unset;
 }
 .attachment-preview > div {
   flex: 1;
@@ -9691,8 +9683,10 @@ img.icon {
 }
 @media screen and (max-width: 991px) {
   .attachment-preview:not(:empty) {
-    border-width: 0 0 1px 0;
-    margin-bottom: 5px;
+    flex: 2;
+  }
+  .attachment-preview:not(:empty) > div.preview-resizer {
+    resize: none;
   }
 }
 .list-form {
@@ -10340,8 +10334,8 @@ input.column-boolean {
   float: none;
 }
 @media screen and (max-width: 767px) {
-  .treeview {
-    height: calc(100vh - 370px);
+  .dict-row {
+    grid-column: 1;
   }
   .dict-label {
     text-align: left;

package/dist/tryton-sao.js

@@ -3,7 +3,7 @@
 
 /* eslint-disable no-redeclare */
 var Sao = {
-    __version__: '7.2.4',
+    __version__: '7.2.6',
 };
 /* eslint-enable no-redeclare */
 
@@ -4485,7 +4485,7 @@ var Sao = {
         },
         stringable: function(domain) {
             const stringable_ = clause => {
-                if (!clause) {
+                if (!clause || jQuery.isEmptyObject(clause)) {
                     return true;
                 }
                 var is_array = function(e) {
@@ -10544,12 +10544,11 @@ var Sao = {
             Sao.field.Dict._super.set.call(this, record, value);
         },
         get: function(record) {
-            return (Sao.field.Dict._super.get.call(this, record) ||
-                    this._default);
+            return jQuery.extend(
+                {}, Sao.field.Dict._super.get.call(this, record));
         },
         get_client: function(record) {
-            return (Sao.field.Dict._super.get_client.call(this, record) ||
-                    this._default);
+            return Sao.field.Dict._super.get_client.call(this, record);
         },
         validation_domains: function(record, pre_validate) {
             return this.get_domains(record, pre_validate)[0];
@@ -17601,6 +17600,7 @@ function eval_pyson(value){
                     params.name = this.attributes.string;
                     params.context = this.field.get_context(this.record);
                     Sao.Tab.create(params);
+                    this._popup = false;
                     return;
                 }
                 var screen = this.get_screen();
@@ -19590,7 +19590,7 @@ function eval_pyson(value){
         },
         set_url: function(value) {
             this.button.attr('href', value);
-            this.button.toggle(value);
+            this.button.toggle(Boolean(value));
         },
         set_invisible: function(invisible) {
             Sao.View.Form.URL._super.set_invisible.call(this, invisible);
@@ -19844,6 +19844,7 @@ function eval_pyson(value){
                     for (const key of new_names) {
                         value[key] = null;
                     }
+                    this.field.set_client(this.record, value);
                     this._display().then(() => {
                         this.fields[new_names[0]].input.focus();
                     });
@@ -20226,7 +20227,9 @@ function eval_pyson(value){
                 return value.map(function(e) { return JSON.parse(e); });
             },
             set_value: function(value) {
-                value = value.map(function(e) { return JSON.stringify(e); });
+                if (value) {
+                    value = value.map(function(e) { return JSON.stringify(e); });
+                }
                 this.input.val(value);
             }
         });
@@ -20999,13 +21002,14 @@ function eval_pyson(value){
             this.selected_records.forEach((record) => {
                 var values = [];
                 this.columns.forEach((col) => {
-                    if (!col.get_visible() || !col.attributes.name) {
+                    if (!col.get_visible() || !col.attributes.name ||
+                        col instanceof Sao.View.Tree.ButtonColumn) {
                         return;
                     }
                     var text;
                     if (!record.is_loaded(col.attributes.name)) {
                         try {
-                            record.load(this.attributes.name, false, false);
+                            record.load(col.attributes.name, false, false);
                             text = col.get_textual_value(record);
                         } catch (e) {
                             Sao.Logger.error(
@@ -21423,6 +21427,7 @@ function eval_pyson(value){
                 }).map(function(row) {
                     return row.el;
                 }));
+                this.update_selection(); // update after new rows has been added
                 if ((this.display_size < this.group.length) &&
                     (!this.tbody.children().last().hasClass('more-row'))) {
                     var more_row = jQuery('<tr/>', {
@@ -21487,9 +21492,7 @@ function eval_pyson(value){
             }
         },
         redraw: function(selected, expanded) {
-            return redraw_async(this.rows, selected, expanded).then(() => {
-                this.update_selection();
-            });
+            return redraw_async(this.rows, selected, expanded);
         },
         switch_: function(path) {
             this.screen.row_activate();
@@ -21714,9 +21717,9 @@ function eval_pyson(value){
             this.selection.prop('indeterminate', false);
             if (jQuery.isEmptyObject(selected_records)) {
                 this.selection.prop('checked', false);
-            } else if (selected_records.length ==
-                    this.tbody.children().length &&
-                    this.display_size >= this.group.length) {
+            } else if (
+                this.rows.every((row) => row.is_selected()) &&
+                (selected_records.length >= this.tbody.children().length)) {
                 this.selection.prop('checked', true);
             } else {
                 this.selection.prop('indeterminate', true);
@@ -23982,7 +23985,15 @@ function eval_pyson(value){
             }, ctx, false);
         },
         _action_key: function(data) {
-            return data.x;
+            var x = data.x;
+            var type = this.view.screen.model.fields[this.xfield.name]
+                .description.type;
+            if (x && (type == 'datetime')) {
+                x = Sao.DateTime(x).toString();
+            } else if (x && (type == 'date')) {
+                x = Sao.Date(x).toString();
+            }
+            return x;
         }
     });
 

package/package.json

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

package/src/common.js

@@ -1190,7 +1190,7 @@
         },
         stringable: function(domain) {
             const stringable_ = clause => {
-                if (!clause) {
+                if (!clause || jQuery.isEmptyObject(clause)) {
                     return true;
                 }
                 var is_array = function(e) {

package/src/model.js

@@ -2906,12 +2906,11 @@
             Sao.field.Dict._super.set.call(this, record, value);
         },
         get: function(record) {
-            return (Sao.field.Dict._super.get.call(this, record) ||
-                    this._default);
+            return jQuery.extend(
+                {}, Sao.field.Dict._super.get.call(this, record));
         },
         get_client: function(record) {
-            return (Sao.field.Dict._super.get_client.call(this, record) ||
-                    this._default);
+            return Sao.field.Dict._super.get_client.call(this, record);
         },
         validation_domains: function(record, pre_validate) {
             return this.get_domains(record, pre_validate)[0];

package/src/sao.js

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

package/src/sao.less

@@ -266,15 +266,6 @@ html[theme="default"] {
     }
 }
 
-@media screen and (max-width: @screen-xs-max) {
-    #tabcontent {
-        > .tab-pane > .panel > .panel-body {
-            flex-direction: column-reverse;
-            min-height: unset;
-        }
-    }
-}
-
 #tabcontent[data-view-type="tree"] {
     display: flex;
     flex: 1;
@@ -545,9 +536,7 @@ img.icon {
     border-style: solid;
     border-width: 0 0 0 1px;
     flex: 1;
-    margin-left: 5px;
-    min-width: 20%;
-    overflow: auto;
+    overflow: unset;
 
     > div {
         flex: 1;
@@ -560,8 +549,11 @@ img.icon {
 
 @media screen and (max-width: @screen-sm-max) {
     .attachment-preview:not(:empty) {
-        border-width: 0 0 1px 0;
-        margin-bottom: 5px;
+        flex: 2;
+
+        > div.preview-resizer {
+            resize: none;
+        }
     }
 }
 
@@ -1101,8 +1093,8 @@ input.column-boolean {
 }
 
 @media screen and (max-width: @screen-xs-max) {
-    .treeview {
-        height: calc(100vh - 370px);
+    .dict-row {
+        grid-column: 1;
     }
     .dict-label {
         text-align: left;

package/src/view/form.js

@@ -2772,6 +2772,7 @@ function eval_pyson(value){
                     params.name = this.attributes.string;
                     params.context = this.field.get_context(this.record);
                     Sao.Tab.create(params);
+                    this._popup = false;
                     return;
                 }
                 var screen = this.get_screen();
@@ -4761,7 +4762,7 @@ function eval_pyson(value){
         },
         set_url: function(value) {
             this.button.attr('href', value);
-            this.button.toggle(value);
+            this.button.toggle(Boolean(value));
         },
         set_invisible: function(invisible) {
             Sao.View.Form.URL._super.set_invisible.call(this, invisible);
@@ -5015,6 +5016,7 @@ function eval_pyson(value){
                     for (const key of new_names) {
                         value[key] = null;
                     }
+                    this.field.set_client(this.record, value);
                     this._display().then(() => {
                         this.fields[new_names[0]].input.focus();
                     });
@@ -5397,7 +5399,9 @@ function eval_pyson(value){
                 return value.map(function(e) { return JSON.parse(e); });
             },
             set_value: function(value) {
-                value = value.map(function(e) { return JSON.stringify(e); });
+                if (value) {
+                    value = value.map(function(e) { return JSON.stringify(e); });
+                }
                 this.input.val(value);
             }
         });

package/src/view/graph.js

@@ -248,7 +248,15 @@
             }, ctx, false);
         },
         _action_key: function(data) {
-            return data.x;
+            var x = data.x;
+            var type = this.view.screen.model.fields[this.xfield.name]
+                .description.type;
+            if (x && (type == 'datetime')) {
+                x = Sao.DateTime(x).toString();
+            } else if (x && (type == 'date')) {
+                x = Sao.Date(x).toString();
+            }
+            return x;
         }
     });
 

package/src/view/tree.js

@@ -506,13 +506,14 @@
             this.selected_records.forEach((record) => {
                 var values = [];
                 this.columns.forEach((col) => {
-                    if (!col.get_visible() || !col.attributes.name) {
+                    if (!col.get_visible() || !col.attributes.name ||
+                        col instanceof Sao.View.Tree.ButtonColumn) {
                         return;
                     }
                     var text;
                     if (!record.is_loaded(col.attributes.name)) {
                         try {
-                            record.load(this.attributes.name, false, false);
+                            record.load(col.attributes.name, false, false);
                             text = col.get_textual_value(record);
                         } catch (e) {
                             Sao.Logger.error(
@@ -930,6 +931,7 @@
                 }).map(function(row) {
                     return row.el;
                 }));
+                this.update_selection(); // update after new rows has been added
                 if ((this.display_size < this.group.length) &&
                     (!this.tbody.children().last().hasClass('more-row'))) {
                     var more_row = jQuery('<tr/>', {
@@ -994,9 +996,7 @@
             }
         },
         redraw: function(selected, expanded) {
-            return redraw_async(this.rows, selected, expanded).then(() => {
-                this.update_selection();
-            });
+            return redraw_async(this.rows, selected, expanded);
         },
         switch_: function(path) {
             this.screen.row_activate();
@@ -1221,9 +1221,9 @@
             this.selection.prop('indeterminate', false);
             if (jQuery.isEmptyObject(selected_records)) {
                 this.selection.prop('checked', false);
-            } else if (selected_records.length ==
-                    this.tbody.children().length &&
-                    this.display_size >= this.group.length) {
+            } else if (
+                this.rows.every((row) => row.is_selected()) &&
+                (selected_records.length >= this.tbody.children().length)) {
                 this.selection.prop('checked', true);
             } else {
                 this.selection.prop('indeterminate', true);

package/tests/sao.js

@@ -2186,6 +2186,8 @@
         });
         var valid = ['name', '=', 'Doe'];
         var invalid = ['surname', '=', 'John'];
+        QUnit.ok(parser.stringable([]));
+        QUnit.ok(parser.stringable([[]]));
         QUnit.ok(parser.stringable([valid]));
         QUnit.ok(!parser.stringable([invalid]));
         QUnit.ok(parser.stringable(['AND', valid]));