From ed6f97690a2ce41177d369c73d7c9aca16090350 Mon Sep 17 00:00:00 2001 From: afabiani Date: Tue, 29 May 2018 18:05:44 +0200 Subject: [PATCH] - Add iso8961 time rules (yyyy/yyyy-mm/yyyy-mm-dd) on Templates also --- geonode/layers/templates/upload/layer_upload_time.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/geonode/layers/templates/upload/layer_upload_time.html b/geonode/layers/templates/upload/layer_upload_time.html index 25a6d7bdd7a..613b58ee3e1 100644 --- a/geonode/layers/templates/upload/layer_upload_time.html +++ b/geonode/layers/templates/upload/layer_upload_time.html @@ -331,7 +331,7 @@ function iso8601DateFormatter(value, row, index) { var time_checked_value = String(value); if(data_validation && !time_checked_value.match( - /(^\d{4}$)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d)|(\d{4}-[01]\d-[0-3]\d)|(\d{4}\/[01]\d\/[0-3]\d)/ + /(^\d{4}$)|(\d{4}-[01]\d)|(\d{4}-[01]\d-[0-3]\d)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\dZ+)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\dZ)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\dZ)/ )) { time_checked_value = '' + ' ' + value +''; @@ -349,7 +349,7 @@ function iso8601Formatter(value, row, index) { var time_checked_value = String(value); if(data_validation && !time_checked_value.match( - /(^\d{4}$)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\dZ+)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\dZ)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\dZ)/ + /(^\d{4}$)|(\d{4}-[01]\d)|(\d{4}-[01]\d-[0-3]\d)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\dZ+)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\dZ)|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\dZ)/ )) { time_checked_value = '' + ' ' + value +'';