tryton-sao 6.2.2 → 6.2.3

package/package.json

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

package/src/action.js

@@ -77,7 +77,7 @@
                 var ctx = {
                     active_model: data.model || null,
                     active_id: data.id || null,
-                    active_ids: data.ids
+                    active_ids: data.ids || [],
                 };
                 ctx = jQuery.extend(ctx, session.context);
                 ctx._user = session.user_id;

package/src/pyson.js

@@ -179,7 +179,7 @@
                 'd': value.d,
             }, context[value.v.substring(0, idx)] || {});
         }
-        if (value.v in context) {
+        if ((value.v in context) && (context[value.v] !== undefined)) {
             return context[value.v];
         } else {
             return value.d;

package/src/sao.less

@@ -47,6 +47,10 @@ button {
     text-overflow: ellipsis;
 }
 
+.input-group > .form-control-feedback {
+    z-index: 3;
+}
+
 .navbar-inverse {
     .close {
         color: @navbar-inverse-link-color;
@@ -194,7 +198,7 @@ button {
 
 html.accesskey {
 
-    *[accesskey]+span[data-accesskey]:after,
+    *[accesskey] ~ span[data-accesskey]:after,
     *[accesskey]:after {
         background-color: @brand-info;
         color: #fff;
@@ -210,7 +214,7 @@ html.accesskey {
         background-color: initial;
     }
 
-    *[accesskey]+span[data-accesskey] {
+    *[accesskey] ~ span[data-accesskey] {
         float: right;
         position: relative;
 
@@ -226,7 +230,7 @@ html.accesskey {
     input[accesskey][type="checkbox"],
     input[accesskey][type="checkbox"],
     select[accesskey] {
-        &+span[data-accesskey] {
+        & ~ span[data-accesskey] {
             bottom: 1em;
         }
     }

package/src/screen.js

@@ -1737,7 +1737,9 @@
                 if (props.selection instanceof Array) {
                     continue;
                 }
+                props = jQuery.extend({}, props);
                 props.selection = this.get_selection(props);
+                fields[name] = props;
             }
 
             if ('arch' in view_tree) {

package/src/theme.less

@@ -149,6 +149,12 @@ input[type=number],
     padding: 0 5px;
 }
 
+.has-feedback {
+  .form-control {
+    padding-right: (@input-height-base * 1.25);
+  }
+}
+
 .input-group-addon {
     background-color: transparent;
     border: transparent;

package/src/view/form.js

@@ -112,7 +112,7 @@ function eval_pyson(value){
                     widget.labelled.get(0).tagName)) {
                     jQuery('<span/>', {
                         'data-accesskey': accesskey,
-                    }).insertAfter(widget.labelled);
+                    }).appendTo(widget.labelled.parent());
                 }
                 label.label_el.attr('for', widget.labelled.attr('id'));
             }

package/tests/sao.js

@@ -102,6 +102,9 @@
             "decode(Eval('test', 0))");
         QUnit.strictEqual(new Sao.PYSON.Decoder().decode(eval_), 0,
             "decode(Eval('test', 0))");
+        QUnit.strictEqual(
+            new Sao.PYSON.Decoder({test: undefined}).decode(eval_), 0,
+            "decode(Eval('test', 0))");
     });
 
     QUnit.test('PYSON Not', function() {