Merge lp:~openerp-dev/openerp-web/trunk-bug-885289-vda into lp:openerp-web

[Vaibhav Darji]

Through exception on unmatched date patern while formating.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

This leads to displaying stuff, but it displays the wrong stuff:

* read_group groups by *month* (and year), and displays a value of the year and month as the group title, this patch changes to displaying a day as well. The day is *not* correct, you will have dates of e.g. "11/10/2011" under the group "01/11/2011"
* read_group returns a preformatted group title, this breaks it

review: Needs Fixing

Unmerged revisions

1419. By Vaibhav Darji on 2011-11-09

[FIX] web failed unmatched date format. format using Date.parse directly in case.

=== modified file 'addons/web/static/src/js/formats.js'
--- addons/web/static/src/js/formats.js	2011-10-27 12:54:48 +0000
+++ addons/web/static/src/js/formats.js	2011-11-09 10:34:12 +0000
@@ -41,8 +41,14 @@
             // name_get value format
             return value[1];
         case 'datetime':
-            if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+            if (typeof(value) == "string") {
+                try {
+                    value = openerp.web.auto_str_to_date(value);
+                } catch(e) {
+                    value = Date.parse(value);
+                }
+            }
+            
             try {
                 return value.toString(_.sprintf("%s %s", Date.CultureInfo.formatPatterns.shortDate,
                     Date.CultureInfo.formatPatterns.longTime));
@@ -51,8 +57,13 @@
             }
             return value;
         case 'date':
-            if (typeof(value) == "string")
-                value = openerp.web.auto_str_to_date(value);
+            if (typeof(value) == "string") {
+                try {
+                    value = openerp.web.auto_str_to_date(value);
+                } catch(e) {
+                    value = Date.parse(value);
+                }
+            }
             try {
                 return value.toString(Date.CultureInfo.formatPatterns.shortDate);
             } catch (e) {