From 3a0b98eb8392488160230777dfafb8fa22447e95 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 12 Jan 2011 15:20:05 -0800
Subject: [PATCH] bug 7956: when middle menu action fails, show error message
 on right panel if this action belongs to the currently selected middle menu
 item.

---
 ui/scripts/cloud.core.js | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 55d5316f782..18f6a38acda 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -399,14 +399,14 @@ function doActionToMidMenu(id, apiInfo, apiCommand) {
 			                        $("body").stopTime(timerKey);	
 			                        $midmenuItem1.find("#content").removeClass("inaction");
 			                        $midmenuItem1.find("#spinning_wheel").hide();			                        
-			                        hideDetailsTabActionSpinningWheel(id, inProcessText);				                        			                       
+			                        hideDetailsTabActionSpinningWheel(id, inProcessText, $midmenuItem1);				                        			                       
 			                        if (result.jobstatus == 1) { // Succeeded  
 			                            $midmenuItem1.find("#info_icon").removeClass("error").show();
 			                            $midmenuItem1.data("afterActionInfo", (label + " action succeeded.")); 			                            
 			                            afterActionSeccessFn(json, $midmenuItem1, id);  			                            
-			                        } else if (result.jobstatus == 2) { // Failed	
-			                            $midmenuItem1.find("#info_icon").addClass("error").show();
-			                            $midmenuItem1.data("afterActionInfo", (label + " action failed. Reason: " + fromdb(result.jobresult.errortext)));    
+			                        } else if (result.jobstatus == 2) { // Failed				                            
+			                            var errorMsg = label + " action failed. Reason: " + fromdb(result.jobresult.errortext);
+			                            handleErrorInMidMenu2(errorMsg, $midmenuItem1, id, inProcessText); 
 			                        }											                    
 		                        }
 	                        },
@@ -438,7 +438,7 @@ function doActionToMidMenu(id, apiInfo, apiCommand) {
 				$midmenuItem1.find("#spinning_wheel").hide();				
 				$midmenuItem1.find("#info_icon").removeClass("error").show();
 			    $midmenuItem1.data("afterActionInfo", (label + " action succeeded.")); 		
-			    hideDetailsTabActionSpinningWheel(id, inProcessText);	
+			    hideDetailsTabActionSpinningWheel(id, inProcessText, $midmenuItem1);	
 				afterActionSeccessFn(json, $midmenuItem1, id); 		
 	        },
             error: function(XMLHttpResponse) {	                
@@ -449,29 +449,34 @@ function doActionToMidMenu(id, apiInfo, apiCommand) {
     //Sync job (end) *****
 }
 
-function handleErrorInMidMenu(XMLHttpResponse, $midmenuItem1, id, inProcessText) { 
-    $midmenuItem1.find("#content").removeClass("inaction");
-	$midmenuItem1.find("#spinning_wheel").hide();	
-	$midmenuItem1.find("#info_icon").addClass("error").show();		
-	$midmenuItem1.find("#first_row").text("Action failed");		
-	hideDetailsTabActionSpinningWheel(id, inProcessText);		
-		                        
+function handleErrorInMidMenu(XMLHttpResponse, $midmenuItem1, id, inProcessText) {     
     var errorMsg = "";
     if(XMLHttpResponse.responseText != null & XMLHttpResponse.responseText.length > 0) {
         errorMsg = parseXMLHttpResponse(XMLHttpResponse);		
     }
+    handleErrorInMidMenu2(errorMsg, $midmenuItem1, id, inProcessText); 
+}  
+
+function handleErrorInMidMenu2(errorMsg, $midmenuItem1, id, inProcessText) { 
+    $midmenuItem1.find("#content").removeClass("inaction");
+	$midmenuItem1.find("#spinning_wheel").hide();	
+	$midmenuItem1.find("#info_icon").addClass("error").show();		
+	//$midmenuItem1.find("#first_row").text("Action failed");		
+	$midmenuItem1.data("afterActionInfo", errorMsg); 
+	hideDetailsTabActionSpinningWheel(id, inProcessText, $midmenuItem1);	                    
+    
     if(errorMsg.length > 0) 
         $midmenuItem1.find("#second_row").text(fromdb(errorMsg));   
     else
         $midmenuItem1.find("#second_row").html("&nbsp;");     
 }  
 
-function hideDetailsTabActionSpinningWheel(id, inProcessText) {			                        
+function hideDetailsTabActionSpinningWheel(id, inProcessText, $midmenuItem1) {			                        
     var $detailsTab = $("#right_panel_content #tab_content_details");  
     var jsonObj = $detailsTab.data("jsonObj");
     var $spinningWheel = $detailsTab.find("#spinning_wheel");         
-    if(jsonObj != null && ("id" in jsonObj) && jsonObj.id == id && ($spinningWheel.find("#description").text() == inProcessText)) {                                                                           
-        $spinningWheel.hide();     
+    if((id == $detailsTab.find("#id").text()) && (inProcessText == $spinningWheel.find("#description").text())) {     
+        copyActionInfoFromMidMenuToRightPanel($midmenuItem1); 
     }
 }