From 5726ebc62bd269ba9ff3a56eb5ad3bb85479eb79 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 15 Dec 2010 13:58:53 -0800
Subject: [PATCH] bug 7466: disableAccount and lockAccount have been merged
 into 1 single command. Here is related UI change.

---
 ui/scripts/cloud.core.account.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index d39613babbf..9e1fb033425 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -219,8 +219,7 @@ function initAddAccountDialog() {
 					        $("#leftmenu_account_all_accounts").click();
 					    }
 					    else {							       
-					        var item = json.createaccountresponse.account;	
-					        debugger;			    			    		
+					        var item = json.createaccountresponse.account;					    			    		
 						    accountToMidmenu(item, $midmenuItem1);
 	                        bindClickToMidMenu($midmenuItem1, accountToRightPanel, getMidmenuId);  
 	                        afterAddingMidMenuItem($midmenuItem1, true);	                       
@@ -508,7 +507,7 @@ var accountActionMap = {
         asyncJobResponse: "disableaccountresponse",
         dialogBeforeActionFn : doDisableAccount,
         inProcessText: "Disabling account....",
-        afterActionSeccessFn: function(json, $midmenuItem1, id) { 
+        afterActionSeccessFn: function(json, $midmenuItem1, id) {             
             var item = json.queryasyncjobresultresponse.jobresult.account;
             accountToMidmenu(item, $midmenuItem1);           
             accountJsonToDetailsTab($midmenuItem1);
@@ -516,11 +515,12 @@ var accountActionMap = {
     }    
     ,
     "Lock account": {              
-        isAsyncJob: false,       
+        isAsyncJob: true,     
+        asyncJobResponse: "disableaccountresponse",  
         dialogBeforeActionFn : doLockAccount,
         inProcessText: "Locking account....",
         afterActionSeccessFn: function(json, $midmenuItem1, id) {  
-            var item = json.lockaccountresponse.account;            
+             var item = json.queryasyncjobresultresponse.jobresult.account;
             accountToMidmenu(item, $midmenuItem1);           
             accountJsonToDetailsTab($midmenuItem1);
         }
@@ -637,7 +637,7 @@ function doDisableAccount($actionLink, $detailsTab, $midmenuItem1) {
     .dialog('option', 'buttons', {                    
         "Yes": function() { 		                    
             $(this).dialog("close");	
-			var apiCommand = "command=disableAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid;	    	
+			var apiCommand = "command=disableAccount&lock=false&account="+jsonObj.name+"&domainId="+jsonObj.domainid;	    	
 	    	doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab) ;         		                    	     
         },
         "Cancel": function() {
@@ -653,7 +653,7 @@ function doLockAccount($actionLink, $detailsTab, $midmenuItem1) {
     .dialog('option', 'buttons', {                    
         "Yes": function() { 		                    
             $(this).dialog("close");			
-			var apiCommand = "command=lockAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid;
+			var apiCommand = "command=disableAccount&lock=true&account="+jsonObj.name+"&domainId="+jsonObj.domainid;
 	    	doActionToTab(jsonObj.id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);	         		                    	     
         },
         "Cancel": function() {