tryton-sao 7.0.48 → 7.0.49

package/package.json

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

package/src/model.js

@@ -955,7 +955,7 @@
                                 this.group.parent.id;
                         }
                     }
-                    return this.set_default(values);
+                    return this.set_default(values).then(() => values);
                 });
             }
             return jQuery.when();

package/src/sao.js

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

package/src/sao.less

@@ -238,14 +238,11 @@ html.accesskey {
         padding: 0 2px;
         position: absolute;
         text-transform: uppercase;
-        margin: 0 -1em;
+        left: -1em;
+        right: 0;
         z-index: 5;
     }
 
-    input[accesskey][type="checkbox"]:after {
-        background-color: initial;
-    }
-
     *[accesskey] ~ span[data-accesskey] {
         float: right;
         position: relative;
@@ -259,11 +256,15 @@ html.accesskey {
         content: attr(accesskey);
     }
 
-    input[accesskey][type="checkbox"],
-    input[accesskey][type="checkbox"],
-    select[accesskey] {
-        & ~ span[data-accesskey] {
-            bottom: 1em;
+    &[dir="rtl"] {
+        *[accesskey] ~ span[data-accesskey]:after,
+        *[accesskey]:after {
+            left: 0;
+            right: -1em;
+        }
+
+        *[accesskey] ~ span[data-accesskey] {
+            float: left;
         }
     }
 }

package/src/tab.js

@@ -13,6 +13,7 @@
             this.name = '';
             this.name_el = jQuery('<span/>');
             this.view_prm = jQuery.when();
+            this._action_running = false;
         },
         menu_def: function() {
             return [
@@ -153,8 +154,13 @@
                     this.menu_buttons[item.id] = menuitem;
                     link.click(evt => {
                         evt.preventDefault();
-                        if (!menuitem.hasClass('disabled')) {
-                            this[item.id]();
+                        if (!menuitem.hasClass('disabled')
+                            && !this._action_running) {
+                            this._action_running = true;
+                            (this[item.id]() || jQuery.when())
+                                .always(() => {
+                                    this._action_running = false;
+                                });
                         }
                     });
                 } else if (!item && previous) {
@@ -254,17 +260,14 @@
                 }
                 this.buttons[item.id].click(item, event => {
                     var item = event.data;
-                    var button = this.buttons[item.id];
-                    // Use data instead of disabled prop because the action may
-                    // actually disable the button.
-                    if (button.data('disabled')) {
+                    if (this._action_running) {
                         event.preventDefault();
                         return;
                     }
-                    button.data('disabled', true);
+                    this._action_running = true;
                     (this[item.id](this) || jQuery.when())
-                        .always(function() {
-                            button.data('disabled', false);
+                        .always(() => {
+                            this._action_running = false;
                         });
                 });
             };
@@ -838,7 +841,7 @@
             } else {
                 prm = jQuery.when();
             }
-            prm.then(() => {
+            return prm.then(() => {
                 var access = Sao.common.MODELACCESS.get(this.screen.model_name);
                 if (this.screen.readonly || !(access.write || access.create)) {
                     return jQuery.Deferred().reject();
@@ -940,18 +943,18 @@
         },
         previous: function() {
             return this.modified_save().then(() => {
-                var prm = this.screen.display_previous();
-                this.info_bar.clear();
-                this.set_buttons_sensitive();
-                return prm;
+                return this.screen.display_previous().then(() => {
+                    this.info_bar.clear();
+                    this.set_buttons_sensitive();
+                });
             });
         },
         next: function() {
             return this.modified_save().then(() => {
-                var prm = this.screen.display_next();
-                this.info_bar.clear();
-                this.set_buttons_sensitive();
-                return prm;
+                return this.screen.display_next().then(() => {
+                    this.info_bar.clear();
+                    this.set_buttons_sensitive();
+                });
             });
         },
         search: function() {

package/src/view/form.js

@@ -370,7 +370,8 @@ function eval_pyson(value){
                 }
             }
             return jQuery.when.apply(jQuery,promesses)
-                .done(() => {
+                .then(() => {
+                    let promesses = [];
                     var record = this.record;
                     for (const name in this.widgets) {
                         var widgets = this.widgets[name];
@@ -382,10 +383,12 @@ function eval_pyson(value){
                             field.set_state(record);
                         }
                         for (const widget of widgets) {
-                            widget.display();
+                            let prm = widget.display();
+                            if (prm) {
+                                promesses.push(prm);
+                            }
                         }
                     }
-                    var promesses = [];
                     for (const j in this.state_widgets) {
                         var state_widget = this.state_widgets[j];
                         var prm = state_widget.set_state(record);
@@ -398,7 +401,7 @@ function eval_pyson(value){
                     }
                     // re-set the grid templates for the StateWidget that are
                     // asynchronous
-                    jQuery.when.apply(jQuery, promesses).done(() => {
+                    return jQuery.when.apply(jQuery, promesses).then(() => {
                         for (const container of this.containers) {
                             container.set_grid_template();
                         }
@@ -2131,11 +2134,13 @@ function eval_pyson(value){
             this.el = jQuery('<div/>', {
                 'class': this.class_
             });
+            this.group = jQuery('<div/>', {
+                'class': 'input-group input-group-sm'
+            }).css('width', '100%').appendTo(this.el);
             this.select = this.labelled = jQuery('<select/>', {
                 'class': 'form-control input-sm mousetrap',
                 'name': attributes.name,
-            });
-            this.el.append(this.select);
+            }).appendTo(this.group);
             this.select.change(this.focus_out.bind(this));
             Sao.common.selection_mixin.init.call(this);
             this.init_selection();
@@ -2236,11 +2241,14 @@ function eval_pyson(value){
             this.el = jQuery('<div/>', {
                 'class': this.class_
             });
+            this.group = jQuery('<div/>', {
+                'class': 'input-group input-group-sm'
+            }).css('width', '100%').appendTo(this.el);
             this.input = this.labelled = jQuery('<input/>', {
                 'type': 'checkbox',
                 'class': 'form-control input-sm mousetrap',
                 'name': attributes.name,
-            }).appendTo(this.el);
+            }).appendTo(this.group);
             this.input.change(this.focus_out.bind(this));
             this.input.click(function() {
                 // Dont trigger click if field is readonly as readonly has no
@@ -3435,7 +3443,7 @@ function eval_pyson(value){
         display: function() {
             Sao.View.Form.One2Many._super.display.call(this);
 
-            this.prm.done(() => {
+            return this.prm.then(() => {
                 this._set_button_sensitive();
 
                 var record = this.record;
@@ -3445,8 +3453,7 @@ function eval_pyson(value){
                     this.screen.new_group();
                     this.screen.current_record = null;
                     this.screen.group.parent = null;
-                    this.screen.display();
-                    return;
+                    return this.screen.display();
                 }
 
                 var new_group = record.field_get_client(this.field_name);
@@ -3475,13 +3482,13 @@ function eval_pyson(value){
                     this.screen.domain = domain;
                 }
                 this.screen.size_limit = size_limit;
-                this.screen.display();
                 if (this.attributes.height !== undefined) {
                     this.content
                         .find('.treeview,.list-form').first()
                         .css('min-height', this.attributes.height + 'px')
                         .css('max-height', this.attributes.height + 'px');
                 }
+                return this.screen.display();
             });
         },
         focus: function() {
@@ -3754,9 +3761,7 @@ function eval_pyson(value){
             return prm;
         },
         set_value: function() {
-            if (this.screen.modified()) {  // TODO check if required
-                this.view.screen.record_modified(false);
-            }
+            this.screen.current_view.set_value();
         },
         _update_completion: function(text) {
             if (!this.record) {
@@ -3960,7 +3965,7 @@ function eval_pyson(value){
         display: function() {
             Sao.View.Form.Many2Many._super.display.call(this);
 
-            this.prm.done(() => {
+            return this.prm.then(() => {
                 var record = this.record;
                 var field = this.field;
 
@@ -3968,20 +3973,19 @@ function eval_pyson(value){
                     this.screen.new_group();
                     this.screen.current_record = null;
                     this.screen.group.parent = null;
-                    this.screen.display();
-                    return;
+                    return this.screen.display();
                 }
                 var new_group = record.field_get_client(this.field_name);
                 if (new_group != this.screen.group) {
                     this.screen.set_group(new_group);
                 }
-                this.screen.display();
                 if (this.attributes.height !== undefined) {
                     this.content
                         .find('.treeview,.list-form').first()
                         .css('min-height', this.attributes.height + 'px')
                         .css('max-height', this.attributes.height + 'px');
                 }
+                return this.screen.display();
             });
         },
         focus: function() {

package/src/view/tree.js

@@ -2591,6 +2591,10 @@
                 fields, false, false, true)) {
                 var value = cell.prop('checked');
                 this.field.set_client(record, value);
+                if (record !== current_record) {
+                    // we can not rely on editable tree handler to save the row
+                    record.save();
+                }
             } else {
                 evt.preventDefault();
             }