odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[fix] fixed some problems in the str_to_x functions 

bzr revid: nicolas.vanhoren@openerp.com-20110822155239-ep2opx33mhm23e4t
This commit is contained in:
niv-openerp 2011-08-22 17:52:39 +02:00
parent 10b5771fb1
commit 0715f66f23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/base/static/src/js/dates.js
View File

@ -15,12 +15,12 @@ openerp.base.str_to_datetime = function(str) {
if(!str) {
return str;
}
var regex = /\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d/;
var regex = /^(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)(?:\.\d+)?$/;
var res = regex.exec(str);
if ( res[0] != str ) {
if ( !res ) {
throw "'" + str + "' is not a valid datetime";
}
var obj = Date.parse(str + " GMT");
var obj = Date.parse(res[1] + " GMT");
if (! obj) {
throw "'" + str + "' is not a valid datetime";
}
@ -38,9 +38,9 @@ openerp.base.str_to_date = function(str) {
if(!str) {
return str;
}
var regex = /\d\d\d\d-\d\d-\d\d/;
var regex = /^\d\d\d\d-\d\d-\d\d$/;
var res = regex.exec(str);
if ( res[0] != str ) {
if ( !res ) {
throw "'" + str + "' is not a valid date";
}
var obj = Date.parse(str);
@ -61,12 +61,12 @@ openerp.base.str_to_time = function(str) {
if(!str) {
return str;
}
var regex = /\d\d:\d\d:\d\d/;
var regex = /^(\d\d:\d\d:\d\d)(?:\.\d+)?$/;
var res = regex.exec(str);
if ( res[0] != str ) {
if ( !res ) {
throw "'" + str + "' is not a valid time";
}
var obj = Date.parse(str);
var obj = Date.parse(res[1]);
if (! obj) {
throw "'" + str + "' is not a valid time";
}