tryton-sao 6.0.21 → 6.0.22

package/package.json

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

package/src/common.js

@@ -226,7 +226,7 @@
 
     Sao.common.date_format = function(format) {
         if (jQuery.isEmptyObject(format)) {
-            format = '%Y-%m-%d';
+            format = '%x';
             if (Sao.Session.current_session) {
                 var context = Sao.Session.current_session.context;
                 if (context.locale && context.locale.date) {

package/src/sao.js

@@ -504,8 +504,8 @@ var Sao = {};
         }
         function open_wizard(path) {
             var attributes = {};
-            attributes.name = path[0];
-            if (!attributes.name) {
+            attributes.action = path[0];
+            if (!attributes.action) {
                 return;
             }
             try {

package/src/tab.js

@@ -1668,20 +1668,17 @@
         },
         _close_allowed: function() {
             var wizard = this.wizard;
-            var prm = jQuery.when();
             if ((wizard.state !== wizard.end_state) &&
                 (wizard.end_state in wizard.states)) {
-                prm = wizard.response(
+                wizard.response(
                     wizard.states[wizard.end_state].attributes);
             }
             var dfd = jQuery.Deferred();
-            prm.always(function() {
-                if (wizard.state === wizard.end_state) {
-                    dfd.resolve();
-                } else {
-                    dfd.reject();
-                }
-            });
+            if (wizard.state === wizard.end_state) {
+                dfd.resolve();
+            } else {
+                dfd.reject();
+            }
             return dfd.promise();
         }
     });

package/src/view/form.js

@@ -1594,7 +1594,6 @@ function eval_pyson(value){
         _input_format: '%Y-%m-%d',
         _format: Sao.common.format_date,
         _parse: Sao.common.parse_date,
-        _default_format: '%x',
         init: function(view, attributes) {
             Sao.View.Form.Date._super.init.call(this, view, attributes);
             this.el = jQuery('<div/>', {
@@ -1673,7 +1672,8 @@ function eval_pyson(value){
             if (this.field && this.record) {
                 return this.field.date_format(this.record);
             } else {
-                return this._default_format;
+                return Sao.common.date_format(
+                    this.view.screen.context.date_format);
             }
         },
         get_value: function() {
@@ -1730,13 +1730,13 @@ function eval_pyson(value){
         _input_format: '%Y-%m-%dT%H:%M:%S',
         _format: Sao.common.format_datetime,
         _parse: Sao.common.parse_datetime,
-        _default_format: '%x %X',
         get_format: function() {
             if (this.field && this.record) {
                 return (this.field.date_format(this.record) + ' ' +
                     this.field.time_format(this.record));
             } else {
-                return this._default_format;
+                return (Sao.common.date_format(
+                    this.view.screen.context.date_format) + ' %X');
             }
         },
         cast: function(value){
@@ -1751,7 +1751,6 @@ function eval_pyson(value){
         _input_format: '%H:%M:%S',
         _format: Sao.common.format_time,
         _parse: Sao.common.parse_time,
-        _default_format: '%X',
         init: function(view, attributes) {
             Sao.View.Form.Time._super.init.call(this, view, attributes);
             if (~navigator.userAgent.indexOf("Firefox")) {
@@ -1763,7 +1762,7 @@ function eval_pyson(value){
             if (this.field && this.record) {
                 return this.field.time_format(this.record);
             } else {
-                return this._default_format;
+                return '%X';
             }
         },
         cast: function(value){

package/tests/sao.js

@@ -1626,22 +1626,27 @@
 
     QUnit.test('DomainParser.convert_value', function() {
         var parser = new Sao.common.DomainParser();
+        var context = {
+            'date_format': '%Y-%m-%d',
+        };
 
         var test_func = function(test) {
             var value = test[0];
             var result = test[1];
-            QUnit.strictEqual(parser.convert_value(this, value), result,
+            QUnit.strictEqual(
+                parser.convert_value(this, value, context), result,
                 'convert_value(' + JSON.stringify(this) + ', ' +
-                    JSON.stringify(value) + ')');
+                JSON.stringify(value) + ', ' + JSON.stringify(context) + ')');
         };
 
         var test_valueOf_func = function(test) {
             var value = test[0];
             var result = test[1];
-            QUnit.strictEqual(parser.convert_value(this, value).valueOf(),
+            QUnit.strictEqual(
+                parser.convert_value(this, value, context).valueOf(),
                 result.valueOf(),
                 'convert_value(' + JSON.stringify(this) + ', ' +
-                    JSON.stringify(value) + ')');
+                JSON.stringify(value) + ', ' + JSON.stringify(context) + ')');
         };
 
         var field = {
@@ -1915,13 +1920,18 @@
 
     QUnit.test('DomainParser.format_value', function() {
         var parser = new Sao.common.DomainParser();
+        var context = {
+            'date_format': '%Y-%m-%d',
+        };
 
         var test_func = function(test) {
             var value = test[0];
             var result = test[1];
-            QUnit.strictEqual(parser.format_value(this, value), result,
+            QUnit.strictEqual(
+                parser.format_value(this, value, null, context), result,
                 'format_value(' + JSON.stringify(this) + ', ' +
-                    JSON.stringify(value) + ')');
+                JSON.stringify(value) + ', null, ' + JSON.stringify(context) +
+                ')');
         };
 
         var field = {