From 5df69e4a217ec7de13b82f3dfeacb4459ca4b66a Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 13 Sep 2011 13:00:59 -0700
Subject: [PATCH] bug 10216: cloudStack - fix a bug => 5. Display format for
 date of event is different whether timezone is configured or not

---
 ui/scripts/cloud.core.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 3bffbcb6f5d..844ef16747d 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1579,7 +1579,7 @@ function isUser() {
 	return (g_role == 0);
 }
 
-function setDateField(dateValue, dateField, htmlMarkup) {
+function setDateField(dateValue, dateField) {
     if (dateValue != null && dateValue.length > 0) {
 	    var disconnected = new Date();
 	    disconnected.setISO8601(dateValue);	
@@ -1587,11 +1587,9 @@ function setDateField(dateValue, dateField, htmlMarkup) {
 	    if(g_timezoneoffset != null) 
 	        showDate = disconnected.getTimePlusTimezoneOffset(g_timezoneoffset);
 	    else 
-	        showDate = disconnected.format("m/d/Y H:i:s");
-	    if(htmlMarkup == null)
-	        dateField.text(showDate);
-	    else
-	        dateField.html(htmlMarkup + showDate);
+	        showDate = disconnected.getTimePlusTimezoneOffset(0);
+	    
+	    dateField.text(showDate);	   
     }
 }