etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-6296: UI > If an account's timezone is not set, show datetime field based on browser's timezoneoffset.

This commit is contained in:
Jessica Wang 2014-03-27 14:12:05 -07:00
parent 8d34419c57
commit 8c8853e0e2
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/scripts/sharedFunctions.js
View File

@ -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;
},