tryton-sao 6.2.3 → 6.2.4

package/package.json

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

package/src/pyson.js

@@ -173,7 +173,7 @@
 
     Sao.PYSON.Eval.eval_ = function(value, context) {
         var idx = value.v.indexOf('.');
-        if (idx >= 0) {
+        if ((idx >= 0) && !(value.v in context)) {
             return Sao.PYSON.Eval.eval_({
                 'v': value.v.substring(idx + 1),
                 'd': value.d,

package/src/view/tree.js

@@ -202,6 +202,23 @@
                 this.table.append(this.tfoot);
             }
 
+            if (this.children_field) {
+                this.expander = jQuery('<span/>', {
+                    'class': 'expander',
+                }).append(jQuery('<img/>', {
+                    'tabindex': 0,
+                    'class': 'icon',
+                }));
+                this.update_expander('more');
+                this.expander.on('click keypress',
+                    Sao.common.click_press(this.unfold.bind(this)));
+                Sao.common.ICONFACTORY.get_icon_url(
+                    'tryton-unfold-' + this.expander.action)
+                    .then(function(url) {
+                        this.expander.children().attr('src', url);
+                    }.bind(this));
+            }
+
             this.columns.forEach(function(column, i) {
                 col = jQuery('<col/>', {
                     'class': column.attributes.widget,
@@ -209,23 +226,6 @@
                 th = jQuery('<th/>', {
                     'class': column.attributes.widget,
                 });
-                if ((i === 0) && this.children_field) {
-                    this.expander = jQuery('<img/>', {
-                        'tabindex': 0,
-                        'class': 'icon',
-                    });
-                    this.update_expander('more');
-                    this.expander.on('click keypress',
-                        Sao.common.click_press(this.unfold.bind(this)));
-                    Sao.common.ICONFACTORY.get_icon_url(
-                        'tryton-unfold-' + this.expander.action)
-                        .then(function(url) {
-                            this.expander.attr('src', url);
-                        }.bind(this));
-                    th.append(jQuery('<span>', {
-                        'class': 'expander',
-                    }).append(this.expander));
-                }
                 var label = jQuery('<label/>')
                     .text(column.attributes.string)
                     .attr('title', column.attributes.string);
@@ -316,7 +316,7 @@
             Sao.common.ICONFACTORY.get_icon_url(
                 'tryton-unfold-' + this.expander.action)
                 .then(function(url) {
-                    this.expander.attr('src', url);
+                    this.expander.children().attr('src', url);
                 }.bind(this));
             if (jQuery.isEmptyObject(this.selected_records)) {
                 this.expander.css('visibility', 'hidden');
@@ -758,8 +758,8 @@
                     !column.col.hasClass('selection-state') &&
                     !column.col.hasClass('favorite')) {
                     var width, c_width;
-                    if (column.width) {
-                        width = c_width = column.width;
+                    if (column.attributes.width) {
+                        width = c_width = column.attributes.width;
                         min_width.push(width + 'px');
                     } else {
                         width = {
@@ -786,6 +786,19 @@
                     column.col.show();
                 }
             }.bind(this));
+            if (this.children_field) {
+                this.columns.every(function(column) {
+                    if (column.col.hasClass('draggable-handle') ||
+                        column.header.hasClass('invisible')) {
+                        return true;
+                    } else {
+                        if (this.expander.parent()[0] !== column.header[0]) {
+                            column.header.prepend(this.expander);
+                        }
+                        return false;
+                    }
+                }.bind(this));
+            }
             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(
@@ -1381,6 +1394,18 @@
                 this.select_column(event_.data.index);
             }.bind(this);
 
+            if (this.children_field) {
+                this.expander = jQuery('<span/>', {
+                    'class': 'expander',
+                }).append('<img/>', {
+                    'tabindex': 0,
+                    'class': 'icon',
+                });
+                this.expander.children().html('&nbsp;');
+                this.expander.on('click keypress',
+                        Sao.common.click_press(this.toggle_row.bind(this)));
+            }
+
             for (var i = 0; i < this.tree.columns.length; i++) {
                 var column = this.tree.columns[i];
                 if (column instanceof Sao.View.Tree.ButtonColumn) {
@@ -1408,18 +1433,6 @@
                     'class': 'cell',
                 });
                 td.append(cell);
-                if ((i === 0) && this.children_field) {
-                    this.expander = jQuery('<img/>', {
-                        'tabindex': 0,
-                        'class': 'icon',
-                    });
-                    this.expander.html('&nbsp;');
-                    this.expander.on('click keypress',
-                            Sao.common.click_press(this.toggle_row.bind(this)));
-                    cell.append(jQuery('<span/>', {
-                        'class': 'expander'
-                    }).append(this.expander));
-                }
                 var j;
                 if (column.prefixes) {
                     for (j = 0; j < column.prefixes.length; j++) {
@@ -1532,6 +1545,21 @@
                     }
                 }
             }
+            if (this.children_field) {
+                this.tree.columns.every(function(column, i) {
+                    if (column.col.hasClass('draggable-handle') ||
+                        column.header.hasClass('invisible')) {
+                        return true;
+                    } else {
+                        var td = this._get_column_td(i);
+                        var cell = td.find('.cell');
+                        if (this.expander.parent()[0] !== cell[0]) {
+                            cell.prepend(this.expander);
+                        }
+                        return false;
+                    }
+                }.bind(this));
+            }
             this._drawed_record = this.record.identity;
 
             var row_id_path = this.get_id_path();
@@ -1542,7 +1570,7 @@
                 if (Sao.i18n.rtl) {
                     margin = 'margin-right';
                 }
-                this.expander.css(margin, (depth - 1) + 'em');
+                this.expander.children().css(margin, (depth - 1) + 'em');
 
                 var update_expander = function() {
                     var length = this.record.field_get_client(
@@ -1606,7 +1634,7 @@
             }
             Sao.common.ICONFACTORY.get_icon_url(icon)
                 .then(function(url) {
-                    this.expander.attr('src', url);
+                    this.expander.children().attr('src', url);
                 }.bind(this));
         },
         collapse_children: function() {

package/tests/sao.js

@@ -1244,6 +1244,20 @@
         });
     });
 
+    QUnit.test('PYSON.EVal dot notation in context', function() {
+        var eval_ = new Sao.PYSON.Encoder().encode(
+            new Sao.PYSON.Eval('foo.bar', 0));
+        var ctx = {
+            'foo.bar': 1,
+            'foo': {
+                'bar': 0,
+            },
+        };
+        QUnit.strictEqual(
+            new Sao.PYSON.Decoder(ctx).decode(eval_), 1,
+            "decode(" + JSON.stringify(ctx) + ")");
+    });
+
     QUnit.test('PYSON eval', function() {
         QUnit.strictEqual(eval_pyson('True'), true, "eval_pyson('True')");
         QUnit.strictEqual(eval_pyson('False'), false, "eval_pyson('False')");