diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-06 00:03:49 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-06 00:03:49 +0200 |
| commit | 05e0bf3f1b7b96a9f8e4f95e529bfe2cc7b44d17 (patch) | |
| tree | ef7b2b735c1ba03d67ff6e431dc008c881c7f5cc /addons/web/static/src | |
| parent | 8517eb3d7b7b29f650a91a05ba91b0eb93f03fcf (diff) | |
| parent | e7190cbbbf78eac105f708113db8ef1516d517d3 (diff) | |
[MERGE] forward port of branch saas-11 up to e7190cb
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/framework/dialog.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/framework/formats.js | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addons/web/static/src/js/framework/dialog.js b/addons/web/static/src/js/framework/dialog.js index bf590f9a582..d527dcf31d8 100644 --- a/addons/web/static/src/js/framework/dialog.js +++ b/addons/web/static/src/js/framework/dialog.js @@ -130,12 +130,12 @@ var Dialog = Widget.extend({ this.$modal.modal('hide'); }, - destroy: function() { + destroy: function(reason) { if (this.isDestroyed()) { return; } - this.trigger("closed"); + this.trigger("closed", reason); this._super(); diff --git a/addons/web/static/src/js/framework/formats.js b/addons/web/static/src/js/framework/formats.js index 24358a7361b..7a47d7076c4 100644 --- a/addons/web/static/src/js/framework/formats.js +++ b/addons/web/static/src/js/framework/formats.js @@ -163,11 +163,17 @@ function parse_value (value, descriptor, value_if_empty) { var datetime = moment(value, [date_pattern + ' ' + time_pattern, date_pattern_wo_zero + ' ' + time_pattern_wo_zero, moment.ISO_8601], true); if (datetime.isValid()) return time.datetime_to_str(datetime.toDate()); + datetime = moment(value, [date_pattern + ' ' + time_pattern, date_pattern_wo_zero + ' ' + time_pattern_wo_zero, moment.ISO_8601]); + if (datetime.isValid()) + return time.datetime_to_str(datetime.toDate()); throw new Error(_.str.sprintf(_t("'%s' is not a correct datetime"), value)); case 'date': var date = moment(value, [date_pattern, date_pattern_wo_zero, moment.ISO_8601], true); if (date.isValid()) return time.date_to_str(date.toDate()); + date = moment(value, [date_pattern, date_pattern_wo_zero, moment.ISO_8601]); + if (date.isValid()) + return time.date_to_str(date.toDate()); throw new Error(_.str.sprintf(_t("'%s' is not a correct date"), value)); case 'time': var _time = moment(value, [time_pattern, time_pattern_wo_zero, moment.ISO_8601], true); |