From 84323d16e993a51608e33059d3220e3657cc5cf1 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 1 Dec 2010 17:41:11 -0800
Subject: [PATCH] instance page - fix a bug that instance groups are duplicate
 when login as user-role and click instance menu more than once.

---
 ui/index.jsp                      | 9 ++++++---
 ui/scripts/cloud.core.instance.js | 5 +++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ui/index.jsp b/ui/index.jsp
index 23ebc88264f..b407314ac25 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -460,9 +460,12 @@
 									<span id="label"><fmt:message key="label.menu.destroyed.instances"/></span>
 								</div>
 							</div>
-						</div>
-                    </div>
-
+						</div>		
+										
+						<div id="leftmenu_instance_group_container">
+                    	</div>	
+                    						
+                    </div>                    
                 </div>
                 <div class="leftmenu_list">
                     <div class="leftmenu_content_flevel" id="leftmenu_storage">
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index 4bc91f47c6d..08872e54810 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -60,7 +60,8 @@ function instanceBuildSubMenu() {
             cache: false,
             data: createURL("command=listInstanceGroups"),	       
             dataType: "json",
-            success: function(json) {	            
+            success: function(json) {	  
+                $("#leftmenu_instance_group_container").empty();          
                 var instancegroups = json.listinstancegroupsresponse.instancegroup;	        	
         	    if(instancegroups!=null && instancegroups.length>0) {           
 	                for(var i=0; i < instancegroups.length; i++) {		                
@@ -76,7 +77,7 @@ function instanceBuildSubMenu2(label, commandString) {
     var $newSubMenu = $("#leftmenu_secondindent_template").clone();
     $newSubMenu.find("#label").text(label);    
     bindAndListMidMenuItems($newSubMenu, commandString, vmGetSearchParams, "listvirtualmachinesresponse", "virtualmachine", "jsp/instance.jsp", afterLoadInstanceJSP, vmToMidmenu, vmToRightPanel, getMidmenuId, true);
-    $("#leftmenu_instance_expandedbox").append($newSubMenu.show());
+    $("#leftmenu_instance_group_container").append($newSubMenu.show());
 }
 
 var $doTemplateNo, $doTemplateCustom,$doTemplateExisting;