mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-10-26 08:42:29 +01:00 
			
		
		
		
	new UI - after details tab action is finished, show success/fail message on the top of right panel instead of showing a dialog covering action panel.
This commit is contained in:
		
							parent
							
								
									5999da510c
								
							
						
					
					
						commit
						97eeee7677
					
				| @ -99,8 +99,9 @@ function doActionToDetailsTab(id, $actionLink, apiCommand, listAPIMap) { | |||||||
| 			                        $("body").stopTime(timerKey);				                         | 			                        $("body").stopTime(timerKey);				                         | ||||||
| 			                        $spinningWheel.hide();      		                        | 			                        $spinningWheel.hide();      		                        | ||||||
| 			                        if (result.jobstatus == 1) { // Succeeded 	
 | 			                        if (result.jobstatus == 1) { // Succeeded 	
 | ||||||
| 			                            $detailsTab.find("#action_message_box #description").text(label + " action succeeded."); | 			                            $("#right_panel_content #after_action_info").text(label + " action succeeded."); | ||||||
| 			                            $detailsTab.find("#action_message_box").removeClass("error").show(); |                                         $("#right_panel_content #after_action_info_container").removeClass("errorbox").show();  | ||||||
|  |                                          | ||||||
| 			                            if(apiCommand.indexOf("command=delete")!=0) { 	 | 			                            if(apiCommand.indexOf("command=delete")!=0) { 	 | ||||||
| 			                                //DestroyVirtualMachine API doesn't return an embedded object on success (Bug 6041)
 | 			                                //DestroyVirtualMachine API doesn't return an embedded object on success (Bug 6041)
 | ||||||
| 	                                        //Before Bug 6041 get fixed, use the temporary solution below.							            
 | 	                                        //Before Bug 6041 get fixed, use the temporary solution below.							            
 | ||||||
| @ -119,8 +120,8 @@ function doActionToDetailsTab(id, $actionLink, apiCommand, listAPIMap) { | |||||||
| 				                            afterActionSeccessFn(id); | 				                            afterActionSeccessFn(id); | ||||||
| 				                        }			                              | 				                        }			                              | ||||||
| 			                        } else if (result.jobstatus == 2) { // Failed		
 | 			                        } else if (result.jobstatus == 2) { // Failed		
 | ||||||
| 			                            $detailsTab.find("#action_message_box #description").text(label + " action failed. Reason: " + sanitizeXSS(result.jobresult));  | 			                            $("#right_panel_content #after_action_info").text(label + " action failed. Reason: " + fromdb(result.jobresult)); | ||||||
| 			                            $detailsTab.find("#action_message_box").addClass("error").show(); |                                         $("#right_panel_content #after_action_info_container").addClass("errorbox").show(); | ||||||
| 			                        }											                     | 			                        }											                     | ||||||
| 		                        } | 		                        } | ||||||
| 	                        }, | 	                        }, | ||||||
| @ -148,8 +149,8 @@ function doActionToDetailsTab(id, $actionLink, apiCommand, listAPIMap) { | |||||||
| 	        async: false, | 	        async: false, | ||||||
| 	        success: function(json) {	             | 	        success: function(json) {	             | ||||||
| 	            $spinningWheel.hide(); 	         | 	            $spinningWheel.hide(); 	         | ||||||
| 	            $detailsTab.find("#action_message_box #description").text(label + " action succeeded."); | 	            $("#right_panel_content #after_action_info").text(label + " action succeeded."); | ||||||
| 			    $detailsTab.find("#action_message_box").removeClass("error").show();          |                 $("#right_panel_content #after_action_info_container").removeClass("errorbox").show();   | ||||||
| 								 | 								 | ||||||
| 				if(apiCommand.indexOf("command=delete")!=0) { 									               | 				if(apiCommand.indexOf("command=delete")!=0) { 									               | ||||||
| 	                //RecoverVirtualMachine API doesn't return an embedded object on success (Bug 6037)
 | 	                //RecoverVirtualMachine API doesn't return an embedded object on success (Bug 6037)
 | ||||||
| @ -188,10 +189,10 @@ function handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label) { | |||||||
|         errorMsg = XMLHttpResponse.responseText.substring(start, end);		 |         errorMsg = XMLHttpResponse.responseText.substring(start, end);		 | ||||||
|     } |     } | ||||||
|     if(errorMsg.length > 0)  |     if(errorMsg.length > 0)  | ||||||
|         $detailsTab.find("#action_message_box #description").text(label + " action failed. Reason: " + sanitizeXSS(unescape(errorMsg)));  |         $("#right_panel_content #after_action_info").text(label + " action failed. Reason: " + fromdb(errorMsg)); | ||||||
|     else |     else | ||||||
|         $detailsTab.find("#action_message_box #description").text(label + " action failed.");     |         $("#right_panel_content #after_action_info").text(label + " action failed.");         | ||||||
|     $detailsTab.find("#action_message_box").addClass("error").show(); |     $("#right_panel_content #after_action_info_container").addClass("errorbox").show(); | ||||||
| }    	                 | }    	                 | ||||||
| //***** actions for details tab in right panel (end) **************************************************************************
 | //***** actions for details tab in right panel (end) **************************************************************************
 | ||||||
| 
 | 
 | ||||||
| @ -568,6 +569,7 @@ function clearMiddleMenu() { | |||||||
| function clearRightPanel() { | function clearRightPanel() { | ||||||
|     $("#right_panel_content #action_message_box").hide();  |     $("#right_panel_content #action_message_box").hide();  | ||||||
|     $("#right_panel_content #tab_content_details #action_link #action_menu #action_list").empty();     |     $("#right_panel_content #tab_content_details #action_link #action_menu #action_list").empty();     | ||||||
|  |     $("#right_panel_content #after_action_info_container").hide();  | ||||||
| } | } | ||||||
|      |      | ||||||
| var selected_leftmenu_id = null;  | var selected_leftmenu_id = null;  | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user