From fdb3b49228061cbcf5f2ef44664ebbf92fe6c356 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 8 Nov 2013 16:17:53 +0100 Subject: [PATCH] CLOUDSTACK-4923: add missing Network limits in Domain details page (cherry picked from commit 20fd5dc84f0c7e0d639991ca1a8baffffd9538a6) --- ui/scripts/domains.js | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js index 7306a38d2d7..5d8fd689bfb 100644 --- a/ui/scripts/domains.js +++ b/ui/scripts/domains.js @@ -213,6 +213,17 @@ }); } + if (args.data.networkLimit != null) { + $.ajax({ + url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=6&max=" + args.data.networkLimit), + dataType: "json", + async: false, + success: function(json) { + domainObj["networkLimit"] = args.data.networkLimit; + } + }); + } + if (args.data.primaryStorageLimit != null) { $.ajax({ url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=10&max=" + args.data.primaryStorageLimit), @@ -432,6 +443,15 @@ return true; } }, + networkLimit: { + label: 'label.network.limits', + isEditable: function(args) { + if (args.domains[0].id == g_domainid) //disallow to update the field on the domain you log in as + return false; + else + return true; + } + }, primaryStorageLimit: { label: 'label.primary.storage.limits', isEditable: function(args) { @@ -560,6 +580,9 @@ case "4": domainObj["templateLimit"] = limit.max; break; + case "6": + domainObj["networkLimit"] = limit.max; + break; case "7": domainObj["vpcLimit"] = limit.max; break;