From 85cc68a74226cc09d16ee3ab9e70bca15ea220c9 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 23 Nov 2010 16:33:40 -0800
Subject: [PATCH] bug 7253: show error message when addnig host fails. (merge
 from 2.2.beta1 branch to master branch)

---
 ui/jsp/resource.jsp               |  4 ++--
 ui/scripts/cloud.core.pod.js      |  9 ++++++---
 ui/scripts/cloud.core.resource.js | 16 +++++++++-------
 ui/scripts/cloud.core.zone.js     |  7 +++++--
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 3a9620ab625..beadf30096b 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -530,7 +530,7 @@
         <form action="#" method="post" id="form_acquire">
         <ol>
             <li>
-                <label style="width: 115px;">
+                <label>
                     Zone:</label>
                 <select class="select" id="zone_dropdown">
                 </select>
@@ -538,7 +538,7 @@
                 </div>
             </li>   
             <li>
-                <label style="width: 115px;">
+                <label>
                     Pod:</label>
                 <select class="select" id="pod_dropdown">
                 </select>
diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js
index 99a18443423..6971dc9c9d0 100644
--- a/ui/scripts/cloud.core.pod.js
+++ b/ui/scripts/cloud.core.pod.js
@@ -372,10 +372,13 @@ function initAddHostButton($button, currentPageInRightPanel) {
                         clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, existingClusterId, $thisDialog);                                  
 			        },			
                     error: function(XMLHttpResponse) {	
-						handleError(XMLHttpResponse, function() {
-							clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, existingClusterId, $thisDialog);  
+						handleError(XMLHttpResponse, function() {							
 							refreshClsuterFieldInAddHostDialog($thisDialog, podId, null);                                
-							handleErrorInDialog(XMLHttpResponse, $thisDialog);
+							handleErrorInDialog(XMLHttpResponse, $thisDialog);							
+							if(clusterRadio == "new_cluster_radio") {    //*** new cluster ***                         
+                                refreshClusterUnderPod($("#pod_" + podId), newClusterName, null, true);  //refresh clusters under pod, but no clicking at any cluster                        
+                                $thisDialog.find("#new_cluster_name").val("");   
+                            }   
 						});
                     }				
 		        });
diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js
index 854c3f88dba..69a82b10b99 100644
--- a/ui/scripts/cloud.core.resource.js
+++ b/ui/scripts/cloud.core.resource.js
@@ -128,7 +128,7 @@ function buildZoneTree() {
 	});  
 }    
 
-function refreshClusterUnderPod($podNode, newClusterName, existingClusterId) {  
+function refreshClusterUnderPod($podNode, newClusterName, existingClusterId, noClicking) {  
     var podId = $podNode.data("podId"); 
     $.ajax({
         data: createURL("command=listClusters&podid="+podId+maxPageSize),
@@ -142,16 +142,15 @@ function refreshClusterUnderPod($podNode, newClusterName, existingClusterId) {
                     var $clusterNode = $("#leftmenu_cluster_node_template").clone(true); 
                     var item = items[i];
                     clusterJSONToTreeNode(item, $clusterNode);
-                    container.append($clusterNode.show());   
-                                        
-                    if(newClusterName != null && fromdb(item.name) == newClusterName) {   
+                    container.append($clusterNode.show());                                     
+                    if(newClusterName != null && fromdb(item.name) == newClusterName && noClicking!=true) {   
                         $clusterNode.find("#cluster_name").click();                
                     }                 
                 }                         
                 $podNode.find("#pod_arrow").removeClass("white_nonexpanded_close").addClass("expanded_open");
                 $podNode.find("#pod_content").show();                  
                 
-                if(existingClusterId != null) {
+                if(existingClusterId != null && noClicking!=true) {
                     $("#cluster_"+existingClusterId).find("#cluster_name").click();	
                 }                      
             }            
@@ -509,10 +508,13 @@ function initAddHostShortcut() {
                         clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, existingClusterId, $thisDialog);                                  
 			        },			
                     error: function(XMLHttpResponse) {	
-						handleError(XMLHttpResponse, function() {					
-							clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, existingClusterId, $thisDialog);    
+						handleError(XMLHttpResponse, function() {							 
 							refreshClsuterFieldInAddHostDialog($thisDialog, podId, null);                     
 							handleErrorInDialog(XMLHttpResponse, $thisDialog);
+							if(clusterRadio == "new_cluster_radio") {    //*** new cluster ***                         
+                               refreshClusterUnderPod($("#pod_" + podId), newClusterName, null, true);  //refresh clusters under pod, but no clicking at any cluster                        
+                               $thisDialog.find("#new_cluster_name").val("");   
+                           }   
 						});
                     }				
 		        });
diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js
index 834b51f1ca9..381e0e5bd21 100644
--- a/ui/scripts/cloud.core.zone.js
+++ b/ui/scripts/cloud.core.zone.js
@@ -995,10 +995,13 @@ function initAddHostButtonOnZonePage($button, zoneId, zoneName) {
                         clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, existingClusterId, $thisDialog);                                  
 			        },			
                     error: function(XMLHttpResponse) {	            
-						handleError(XMLHttpResponse, function() {						  				
-							clickClusterNodeAfterAddHost(clusterRadio, podId, newClusterName, existingClusterId, $thisDialog);    
+						handleError(XMLHttpResponse, function() {						  
 							refreshClsuterFieldInAddHostDialog($thisDialog, podId, null);                     
 							handleErrorInDialog(XMLHttpResponse, $thisDialog);
+							if(clusterRadio == "new_cluster_radio") {    //*** new cluster ***                         
+                               refreshClusterUnderPod($("#pod_" + podId), newClusterName, null, true);  //refresh clusters under pod, but no clicking at any cluster                        
+                               $thisDialog.find("#new_cluster_name").val("");   
+                           }   
 						});
                     }				
 		        });