From baed52fc99c14c3deadcd03c9123933a9bdf4995 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 6 Dec 2010 12:49:24 -0800
Subject: [PATCH] account page - creating new account is using createUser API
 (we don't have createAccount API). So, the object returned is user object
 instead of account object. We need to call listAccounts to get account object
 to update UI.

---
 ui/jsp/account.jsp               |  2 +-
 ui/scripts/cloud.core.account.js | 26 +++++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp
index 4efea1435b5..a8b11b23c48 100644
--- a/ui/jsp/account.jsp
+++ b/ui/jsp/account.jsp
@@ -338,7 +338,7 @@
 </div>
 
 <!-- Add User Dialog (begin)-->
-<div id="dialog_add_user" title="Add New user" style="display: none">   
+<div id="dialog_add_account" title="Add New Account" style="display: none">   
     <div class="dialog_formcontent">
         <form action="#" method="post" id="form_acquire">
         <ol>
diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index aa2f01fe263..561b18982f3 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -127,16 +127,16 @@ function initTimezonesObj() {
 
 function initAddUserDialog() { 
     //dialogs
-    initDialog("dialog_add_user", 450);
+    initDialog("dialog_add_account", 450);
                    
-    var $dialogAddUser = $("#dialog_add_user");
+    var $dialogAddAccount = $("#dialog_add_account");
        
     $.ajax({
 	    data: createURL("command=listDomains"),
 		dataType: "json",
 		success: function(json) {			           
 			var domains = json.listdomainsresponse.domain;								
-			var $dropDownBox = $dialogAddUser.find("#domain_dropdown").empty();									       		            							
+			var $dropDownBox = $dialogAddAccount.find("#domain_dropdown").empty();									       		            							
 			if (domains != null && domains.length > 0) {
 				for (var i = 0; i < domains.length; i++) 				
 					$dropDownBox.append("<option value='" + fromdb(domains[i].id) + "'>" + fromdb(domains[i].name) + "</option>"); 		
@@ -145,10 +145,10 @@ function initAddUserDialog() {
 	});		    
        
     //add button ***
-    $("#midmenu_add_link").find("#label").text("Add User"); 
+    $("#midmenu_add_link").find("#label").text("Add Account"); 
     $("#midmenu_add_link").show();     
     $("#midmenu_add_link").unbind("click").bind("click", function(event) {    		
-		$dialogAddUser
+		$dialogAddAccount
 		.dialog('option', 'buttons', { 					
 			"Create": function() { 	
 			    var $thisDialog = $(this);				    			
@@ -211,8 +211,20 @@ function initAddUserDialog() {
 				    data: createURL("command=createUser"+array1.join("")),
 					dataType: "json",
 					async: false,
-					success: function(json) {						
-						accountToMidmenu(json.createuserresponse.user, $midmenuItem1);
+					success: function(json) {						    
+					    var user = json.createuserresponse.user;	
+					    var item;					    
+					    $.ajax({
+					        data: createURL("command=listAccounts&domainid="+user.domainid+"&account="+user.account),
+					        dataType: "json",
+					        async: false,
+					        success: function(json) {					            
+					            var items = json.listaccountsresponse.account;
+					            if(items != null && items.length > 0)
+					                item = items[0];
+					        }
+					    });					    			    		
+						accountToMidmenu(item, $midmenuItem1);
 	                    bindClickToMidMenu($midmenuItem1, accountToRightPanel, getMidmenuId);  
 	                    afterAddingMidMenuItem($midmenuItem1, true);								
 					},