[FIX] web: normalize_format was not correctly taking into account whatever char added...
authorCedric Snauwaert <csn@openerp.com>
Wed, 17 Sep 2014 08:55:29 +0000 (10:55 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 5 Nov 2014 14:27:59 +0000 (15:27 +0100)
addons/web/static/src/js/formats.js

index 1105aeb..f98e7ca 100644 (file)
@@ -208,7 +208,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
     var date_pattern = instance.web.normalize_format(_t.database.parameters.date_format),
         time_pattern = instance.web.normalize_format(_t.database.parameters.time_format);
     var date_pattern_wo_zero = date_pattern.replace('MM','M').replace('DD','D'),
-        time_pattern_wo_zero = date_pattern.replace('HH','H').replace('mm','m').replace('ss','s');
+        time_pattern_wo_zero = time_pattern.replace('HH','H').replace('mm','m').replace('ss','s');
     switch (value) {
         case false:
         case "":
@@ -375,6 +375,9 @@ instance.web.normalize_format = function(format){
         moment_format += unformatted + (replacement ? replacement : format[directive_index]);
         format = format.substr(directive_index+1);
     }
+    if (format.length){
+        moment_format += '['+format+']';
+    }
     return moment_format;
 };