diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 5a5df5ef29f..9e049814dd7 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -326,6 +326,15 @@ accountObj["templateLimit"] = args.data.templateLimit; } }); + + $.ajax({ + url: createURL("updateResourceLimit&resourceType=7&max=" + todb(args.data.vpcLimit) + "&account=" + accountObj.name + "&domainid=" + accountObj.domainid), + dataType: "json", + async: false, + success: function(json) { + accountObj["vpcLimit"] = args.data.vpcLimit; + } + }); if(errorMsg == "") args.response.success({data: accountObj}); @@ -555,6 +564,10 @@ label: 'label.template.limits', isEditable: true }, + vpcLimit: { + label: 'VPC limits', + isEditable: true + }, vmtotal: { label: 'label.total.of.vm' }, iptotal: { label: 'label.total.of.ip' }, @@ -595,21 +608,24 @@ 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; + 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; + case "7": + accountObj["vpcLimit"] = limit.max; + break; } } } diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js index bc24492aff2..307486d7f2f 100644 --- a/ui/scripts/domains.js +++ b/ui/scripts/domains.js @@ -145,6 +145,14 @@ domainObj["templateLimit"] = args.data.templateLimit; } }); + $.ajax({ + url: createURL("updateResourceLimit&domainid=" + args.context.domains[0].id + "&resourceType=7&max=" + args.data.vpcLimit), + dataType: "json", + async: false, + success: function(json) { + domainObj["vpcLimit"] = args.data.vpcLimit; + } + }); args.response.success({data: domainObj}); } @@ -262,6 +270,10 @@ label: 'label.template.limits', isEditable: true }, + vpcLimit: { + label: 'VPC limits', + isEditable: true + }, accountTotal: { label: 'label.accounts' }, vmTotal: { label: 'label.instances' }, volumeTotal: { label: 'label.volumes' } @@ -335,21 +347,24 @@ for (var i = 0; i < limits.length; i++) { var limit = limits[i]; switch (limit.resourcetype) { - case "0": - domainObj["vmLimit"] = limit.max; - break; - case "1": - domainObj["ipLimit"] = limit.max; - break; - case "2": - domainObj["volumeLimit"] = limit.max; - break; - case "3": - domainObj["snapshotLimit"] = limit.max; - break; - case "4": - domainObj["templateLimit"] = limit.max; - break; + case "0": + domainObj["vmLimit"] = limit.max; + break; + case "1": + domainObj["ipLimit"] = limit.max; + break; + case "2": + domainObj["volumeLimit"] = limit.max; + break; + case "3": + domainObj["snapshotLimit"] = limit.max; + break; + case "4": + domainObj["templateLimit"] = limit.max; + break; + case "7": + domainObj["vpcLimit"] = limit.max; + break; } } }