From d1e2b2fcb66e0da62a4a608d32b0a97ecb3718d4 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 2 Mar 2012 11:29:36 -0800 Subject: [PATCH] Account page - account detail view - implement Refresh button. [reviewed-by: Brian] --- ui/scripts/accounts.js | 80 ++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 16f86646abf..1b688436c3d 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -545,45 +545,49 @@ ], dataProvider: function(args) { - var accountObj = args.context.accounts[0]; + $.ajax({ + url: createURL("listAccounts&id=" + args.context.accounts[0].id), + dataType: "json", + success: function(json) { + var accountObj = json.listaccountsresponse.account[0]; - $.ajax({ - url: createURL("listResourceLimits&domainid=" + accountObj.domainid + "&account=" + accountObj.name), - dataType: "json", - async: false, - success: function(json) { - var limits = json.listresourcelimitsresponse.resourcelimit; - if (limits != null) { - for (var i = 0; i < limits.length; i++) { - var limit = limits[i]; - switch (limit.resourcetype) { - case "0": - accountObj["vmLimit"] = limit.max; - break; - case "1": - accountObj["ipLimit"] = limit.max; - break; - case "2": - accountObj["volumeLimit"] = limit.max; - break; - case "3": - accountObj["snapshotLimit"] = limit.max; - break; - case "4": - accountObj["templateLimit"] = limit.max; - break; - } - } - } - } - }); - - args.response.success( - { - actionFilter: accountActionfilter, - data: accountObj - } - ); + $.ajax({ + url: createURL("listResourceLimits&domainid=" + accountObj.domainid + "&account=" + accountObj.name), + dataType: "json", + success: function(json) { + var limits = json.listresourcelimitsresponse.resourcelimit; + if (limits != null) { + for (var i = 0; i < limits.length; i++) { + var limit = limits[i]; + switch (limit.resourcetype) { + case "0": + accountObj["vmLimit"] = limit.max; + break; + case "1": + accountObj["ipLimit"] = limit.max; + break; + case "2": + accountObj["volumeLimit"] = limit.max; + break; + case "3": + accountObj["snapshotLimit"] = limit.max; + break; + case "4": + accountObj["templateLimit"] = limit.max; + break; + } + } + } + args.response.success( + { + actionFilter: accountActionfilter, + data: accountObj + } + ); + } + }); + } + }); } } }