Bug 24980: (follow-up) return '' when date is null

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc
index 64c8e8f..3dae094 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc
@@ -32,6 +32,7 @@
          * as well as a 'withtime' boolean denoting whether to include time or not in the output string.
          */
         window.$date = function(value, options) {
+            if(!value) return '';
             var tz = (options&&options.tz)||def_tz;
             var m = moment(value);
             if((m.creationData().format !== 'YYYY-MM-DD')&&tz) m.tz(tz);
@@ -55,6 +56,7 @@
         };
 
         window.$time = function(value, options) {
+            if(!value) return '';
             var tz = (opitons&&options.tz)||def_tz;
             var m = moment(value);
             if(tz) m.tz(tz);

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-date-format.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-date-format.inc
index 21301d7..643cda0 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-date-format.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/js-date-format.inc
@@ -31,6 +31,7 @@
          * as well as a 'withtime' boolean denoting whether to include time or not in the output string.
          */
         window.$date = function(value, options) {
+            if(!value) return '';
             var tz = (options&&options.tz)||def_tz;
             var m = moment(value);
             if((m.creationData().format !== 'YYYY-MM-DD')&&tz) m.tz(tz);
@@ -54,6 +55,7 @@
         };
 
         window.$time = function(value, options) {
+            if(!value) return '';
             var tz = (opitons&&options.tz)||def_tz;
             var m = moment(value);
             if(tz) m.tz(tz);