From 41996fbcf9efd1970077f9e9c4ac157737c2c0b0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 3 Dec 2010 20:06:21 -0800
Subject: [PATCH] Add Domain Dialog box - default parent domain dropdown field
 to the domain who is curretnly loaded in right panel.

---
 ui/scripts/cloud.core.domain.js | 44 +++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/ui/scripts/cloud.core.domain.js b/ui/scripts/cloud.core.domain.js
index fb6ac7c9989..f4f42f0463e 100644
--- a/ui/scripts/cloud.core.domain.js
+++ b/ui/scripts/cloud.core.domain.js
@@ -124,27 +124,35 @@ function afterLoadDomainJSP() {
 function initAddDomainDialog() {
     initDialog("dialog_add_domain", 450);
     
-    var $dialogAddDomain = $("#dialog_add_domain");
-               
-	$.ajax({
-	  data: createURL("command=listDomains"),
-		dataType: "json",
-		async: false,
-		success: function(json) {
-		    var $domainDropdown1 = $dialogAddDomain.find("#domain_dropdown").empty();		  
-			var domains = json.listdomainsresponse.domain;						
-			if (domains != null && domains.length > 0) {
-				for (var i = 0; i < domains.length; i++) {
-					$domainDropdown1.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>"); 					
-				}
-			} 
-		}
-	});   
-		 
+    var $dialogAddDomain = $("#dialog_add_domain");              
+	
     //add button ***
     $("#midmenu_add_link").find("#label").text("Add Domain"); 
     $("#midmenu_add_link").show();     
-    $("#midmenu_add_link").unbind("click").bind("click", function(event) {      
+    $("#midmenu_add_link").unbind("click").bind("click", function(event) {  
+    
+        $dialogAddDomain.find("#add_domain_name").val("");
+        
+        $.ajax({
+	      data: createURL("command=listDomains"),
+		    dataType: "json",
+		    async: false,
+		    success: function(json) {
+		        var $domainDropdown1 = $dialogAddDomain.find("#domain_dropdown").empty();		  
+			    var domains = json.listdomainsresponse.domain;						
+			    if (domains != null && domains.length > 0) {
+				    for (var i = 0; i < domains.length; i++) {
+					    $domainDropdown1.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>"); 					
+				    }
+			    } 
+			   
+			    var $thisTab = $("#right_panel_content").find("#tab_content_details");    
+                var domainId = $thisTab.find("#id").text();   //get domainId from here in case domain page is empty (e.g. when a domain was just deleted)
+                if(domainId != null && domainId.length > 0)
+                    $domainDropdown1.val(domainId);			    		    
+		    }
+	    });  
+        
 		$dialogAddDomain
 		.dialog('option', 'buttons', { 					
 			"Create": function() {