From 503eeb8248975ace27c8d44ef40b442a291238e9 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 27 Mar 2014 14:12:05 -0700 Subject: [PATCH] CLOUDSTACK-6296: UI > If an account's timezone is not set, show datetime field based on browser's timezoneoffset. --- ui/scripts/sharedFunctions.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 9c24f404890..4d4344e152c 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -919,11 +919,18 @@ cloudStack.converters = { var disconnected = new Date(); disconnected.setISO8601(UtcDate); - if (g_timezoneoffset != null) + if (g_timezoneoffset != null) { localDate = disconnected.getTimePlusTimezoneOffset(g_timezoneoffset); - else - localDate = disconnected.toUTCString(); - // localDate = disconnected.getTimePlusTimezoneOffset(0); + } else { + var browserDate = new Date(); + var browserTimezoneoffset = browserDate.getTimezoneOffset(); + if (browserTimezoneoffset == undefined || isNaN(browserTimezoneoffset) ) { + localDate = disconnected.toUTCString(); + } else { + g_timezoneoffset = (browserTimezoneoffset/60) * (-1); + localDate = disconnected.getTimePlusTimezoneOffset(g_timezoneoffset); + } + } } return localDate; },