From d30df89e86a50823c17c4e8f3a1dab977661bc18 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 21 Sep 2010 18:14:08 -0700
Subject: [PATCH] fix bug 6130 - when attaching volume, running and stopped VMs
 not displayed consistently.

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

diff --git a/ui/scripts/cloud.core.storage.js b/ui/scripts/cloud.core.storage.js
index f4c55f8cf01..c6c85f23bea 100644
--- a/ui/scripts/cloud.core.storage.js
+++ b/ui/scripts/cloud.core.storage.js
@@ -75,7 +75,7 @@ function showStorageTab(domainId, targetTab) {
 			    var volumeVmSelect = $("#dialog_attach_volume").find("#volume_vm").empty();					
 			    if (instances != null && instances.length > 0) {
 				    for (var i = 0; i < instances.length; i++) {
-					    volumeVmSelect.append("<option value='" + instances[i].id + "'>" + getVmName(instances[i].name, instances[i].displayname)+ "</option>"); 
+					    volumeVmSelect.append("<option value='" + instances[i].id + "'>" + getVmName(instances[i].name, instances[i].displayname) + "</option>"); 
 				    }				    
 			    }
 				$.ajax({
@@ -86,7 +86,7 @@ function showStorageTab(domainId, targetTab) {
 						var instances = json.listvirtualmachinesresponse.virtualmachine;								
 						if (instances != null && instances.length > 0) {
 							for (var i = 0; i < instances.length; i++) {
-								volumeVmSelect.append("<option value='" + instances[i].id + "'>" + sanitizeXSS(instances[i].name) + "</option>");
+								volumeVmSelect.append("<option value='" + instances[i].id + "'>" + getVmName(instances[i].name, instances[i].displayname) + "</option>");
 							}				    
 						}
 					}