[imp] cosmetic improvement in formats.js

bzr revid: nicolas.vanhoren@openerp.com-20110901142156-ywr95g2qe85kkhe8

1 files changed, 16 insertions, 16 deletions

diff --git a/addons/base/static/src/js/formats.js b/addons/base/static/src/js/formats.js
index 0f79ca84bf4..bd81238ddd8 100644
--- a/addons/base/static/src/js/formats.js
+++ b/addons/base/static/src/js/formats.js
@@ -45,7 +45,7 @@ openerp.base.format_value = function (value, descriptor, value_if_empty) {
             return value[1];
         case 'datetime':
             if (typeof(value) == "string")
-                value = approx_str_to_date(value, descriptor.type) || openerp.base.str_to_datetime(value);
+                value = auto_str_to_date(value, descriptor.type);
             try {
                 return value.toString(_.sprintf("%s %s", Date.CultureInfo.formatPatterns.shortDate,
                     Date.CultureInfo.formatPatterns.longTime));
@@ -55,7 +55,7 @@ openerp.base.format_value = function (value, descriptor, value_if_empty) {
             return value;
         case 'date':
             if (typeof(value) == "string")
-                value = approx_str_to_date(value, descriptor.type) || openerp.base.str_to_date(value);
+                value = auto_str_to_date(value, descriptor.type);
             try {
                 return value.toString(Date.CultureInfo.formatPatterns.shortDate);
             } catch (e) {
@@ -63,7 +63,7 @@ openerp.base.format_value = function (value, descriptor, value_if_empty) {
             }
         case 'time':
             if (typeof(value) == "string")
-                value = approx_str_to_date(value, descriptor.type) || openerp.base.str_to_time(value);
+                value = auto_str_to_date(value, descriptor.type);
             try {
                 return value.toString(Date.CultureInfo.formatPatterns.longTime);
             } catch (e) {
@@ -74,19 +74,6 @@ openerp.base.format_value = function (value, descriptor, value_if_empty) {
     }
 };
 
-var approx_str_to_date = function(value, type) {
-    switch(type) {
-        case 'datetime':
-            return openerp.base.str_to_datetime(value);
-        case 'date':
-            return openerp.base.str_to_date(value);
-        case 'time':
-            return openerp.base.str_to_time(value);
-        default:
-            return null;
-    }
-}
-
 openerp.base.parse_value = function (value, descriptor, value_if_empty) {
     switch (value) {
         case false:
@@ -151,6 +138,19 @@ openerp.base.parse_value = function (value, descriptor, value_if_empty) {
     return value;
 };
 
+var auto_str_to_date = function(value, type) {
+    switch(type) {
+        case 'datetime':
+            return openerp.base.str_to_datetime(value);
+        case 'date':
+            return openerp.base.str_to_date(value);
+        case 'time':
+            return openerp.base.str_to_time(value);
+        default:
+            throw "'" + value + "' is not a valid date, datetime nor time"
+    }
+};
+
 /**
  * Formats a provided cell based on its field type
  *