From f456632a159c7af11258416890a1df502a7874f2 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 10 Sep 2010 16:57:50 -0700
Subject: [PATCH] new UI - instance page - specify group name when calling
 listvirtualmachine API (when users click on instance group on left menu).

---
 ui/new/index.jsp                       |  3 +--
 ui/new/scripts/cloud.core2.init.js     |  5 ++---
 ui/new/scripts/cloud.core2.instance.js | 23 +++++++++--------------
 ui/new/scripts/cloud.core2.js          |  2 +-
 4 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/ui/new/index.jsp b/ui/new/index.jsp
index 0591dd46dda..425edbeaab9 100644
--- a/ui/new/index.jsp
+++ b/ui/new/index.jsp
@@ -622,8 +622,7 @@ long milliseconds = new Date().getTime();
                 <p>
                     <strong id="first_row">&nbsp;</strong>
                 </p>
-                <p id="second_row_container">
-                    <span id="second_row_label">&nbsp;</span> 
+                <p id="second_row_container">                    
                     <span id="second_row">&nbsp;</span>
                 </p>
             </div>
diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js
index ef134d0376d..38bce04dbb1 100644
--- a/ui/new/scripts/cloud.core2.init.js
+++ b/ui/new/scripts/cloud.core2.init.js
@@ -60,11 +60,10 @@ $(document).ready(function() {
     var $midmenuItem = $("#midmenu_item");
     function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, rightPanelJSP, toMidmenu, toRightPanel) { 
         $("#"+leftmenuId).bind("click", function(event) {
-            $("#right_panel").load(rightPanelJSP);
-        
+            $("#right_panel").load(rightPanelJSP);           
             $.ajax({
 	            cache: false,
-	            data: createURL("command="+apiName+"&response=json"),
+	            data: createURL("command="+apiName+"&pagesize="+midmenuItemCount),
 	            dataType: "json",
 	            success: function(json) {	
 	                $("#midmenu_container").empty();
diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js
index e47012af1e6..91c1aa74e7b 100644
--- a/ui/new/scripts/cloud.core2.instance.js
+++ b/ui/new/scripts/cloud.core2.instance.js
@@ -480,31 +480,26 @@ function clickInstanceGroupHeader($arrowIcon) {
                             $("#midmenu_container").empty();
                             selectedItemsInMidMenu = {};
                             
-                            var groupName = $(this).find("#group_name").text();
+                            var groupName = $(this).find("#group_name").text();                                                         
+                            var group1 = groupName; 
+                            if(groupName == noGroupName)
+                                group1 = "";                           
                                                         
                             $.ajax({
 	                            cache: false,
-	                            data: createURL("command=listVirtualMachines"),
+	                            data: createURL("command=listVirtualMachines&group="+group1+"&pagesize="+midmenuItemCount),
 	                            dataType: "json",
 	                            success: function(json) {		                                                             
 	                                var instances = json.listvirtualmachinesresponse.virtualmachine;                               
-                                    for(var i=0; i<instances.length;i++) {                
-                                        var instance = instances[i];
-                                        var instanceGroup = instance.group;
-                                        if(instanceGroup == null || instanceGroup == "")
-                                            instanceGroup = noGroupName;                                                                       
-                                        if(instanceGroup != groupName)
-                                            continue;                                        
+                                    for(var i=0; i<instances.length;i++) {  
                                         var $template = $midmenuItem.clone();                                                                                                                               
-                                        vmJsonToMidmenu(instance, $template);  
+                                        vmJsonToMidmenu(instances[i], $template);  
                                         $("#midmenu_container").append($template.show());
                                     }    
 	                            }
-	                        });
-                            
+	                        });                            
                             return false;
-                        });			                
-		                
+                        });	
 		                $("#leftmenu_instance_group_container").append($groupTemplate);
 		            }
 		        }
diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js
index 2ef6d2858f8..c0de80bc91d 100644
--- a/ui/new/scripts/cloud.core2.js
+++ b/ui/new/scripts/cloud.core2.js
@@ -192,7 +192,7 @@ function todb(val) {
     return encodeURIComponent(escape(val));
 }
 
-
+var midmenuItemCount = 20;