diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js index 4f077727aad..6c3b288ac96 100644 --- a/ui/scripts/cloud.core.account.js +++ b/ui/scripts/cloud.core.account.js @@ -215,26 +215,26 @@ function initAddAccountDialog() { dataType: "json", async: false, success: function(json) { - $("#leftmenu_account_all_accounts").click(); - - //comment the following section for fixing Bug 7452 ("Adding an account under My Account will result in a duplicate") - /* - 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); - */ + if($("#leftmenu_account_all_accounts").hasClass("selected") == false) { //for fixing Bug 7452 ("Adding an account under My Account will result in a duplicate") + $("#leftmenu_account_all_accounts").click(); + } + else { + 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); + } }, error: function(XMLHttpResponse) { afterAddingMidMenuItem($midmenuItem1, false, parseXMLHttpResponse(XMLHttpResponse));