From fae0d33a491d30bb0d97c9e02da7eca9d59ceaff Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 13 Jun 2011 14:58:56 -0700
Subject: [PATCH] bug 10232: CloudStack UI - Instance page - fix a bug that
 VMName was not decoded when encode.api.response is set to true.

---
 ui/scripts/cloud.core.js | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index de36fec844d..527ade9c076 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1947,27 +1947,13 @@ function sanitizeXSS(val) {
 function getVmName(p_vmName, p_vmDisplayname) {
     if(p_vmDisplayname == null)
         return fromdb(p_vmName);
-    var vmName = null;
-	
+    
+    var vmName = null;	
 	if (p_vmDisplayname != p_vmName) {
-		vmName = p_vmName + "(" + fromdb(p_vmDisplayname) + ")";
+		vmName = fromdb(p_vmName) + "(" + fromdb(p_vmDisplayname) + ")";
 	} else {
-		vmName = p_vmName;
-	}	
-	
-	/*
-	if (isAdmin()) {
-		if (p_vmDisplayname != p_vmName) {
-			vmName = p_vmName + "(" + fromdb(p_vmDisplayname) + ")";
-		} else {
-			vmName = p_vmName;
-		}
-	} else {
-		vmName = fromdb(p_vmDisplayname);
-	}
-	*/
-	
-	
+		vmName = fromdb(p_vmName);
+	}		
 	return vmName;
 }