Updated Branches: refs/heads/master 770bfe435 -> 0f976fd32
CLOUDSTAC.K-4923: add missing Network limits in Accounts details page Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0f976fd3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0f976fd3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0f976fd3 Branch: refs/heads/master Commit: 0f976fd328ed5632201553ddeb69d9fa9ab500a4 Parents: 770bfe4 Author: Wei Zhou <[email protected]> Authored: Tue Oct 22 15:58:17 2013 +0200 Committer: Wei Zhou <[email protected]> Committed: Tue Oct 22 15:58:17 2013 +0200 ---------------------------------------------------------------------- .../classes/resources/messages.properties | 1 + ui/dictionary.jsp | 1 + ui/scripts/accounts.js | 30 ++++++++++++++++++++ 3 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f976fd3/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index c075bf8..5735ccd 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -810,6 +810,7 @@ label.network.domain.text=Network domain label.network.domain=Network Domain label.network.id=Network ID label.network.label.display.for.blank.value=Use default gateway +label.network.limits=Network limits label.network.name=Network Name label.network.offering.display.text=Network Offering Display Text label.network.offering.id=Network Offering ID http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f976fd3/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 80aab6f..9ab644b 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -799,6 +799,7 @@ dictionary = { 'label.network.id': '<fmt:message key="label.network.id" />', 'label.networking.and.security': '<fmt:message key="label.networking.and.security" />', 'label.network.label.display.for.blank.value': '<fmt:message key="label.network.label.display.for.blank.value" />', +'label.network.limits': '<fmt:message key="label.network.limits" />', 'label.network.name': '<fmt:message key="label.network.name" />', 'label.network.offering.display.text': '<fmt:message key="label.network.offering.display.text" />', 'label.network.offering': '<fmt:message key="label.network.offering" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0f976fd3/ui/scripts/accounts.js ---------------------------------------------------------------------- diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 14f7660..a754d31 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -291,6 +291,24 @@ }); } + if (args.data.networkLimit != null) { + var data = { + resourceType: 6, + max: args.data.networkLimit, + domainid: accountObj.domainid, + account: accountObj.name + }; + + $.ajax({ + url: createURL('updateResourceLimit'), + data: data, + async: false, + success: function(json) { + accountObj["networkLimit"] = args.data.networkLimit; + } + }); + } + if (args.data.primaryStorageLimit != null) { var data = { resourceType: 10, @@ -651,6 +669,15 @@ return false; } }, + networkLimit: { + label: 'label.network.limits', + isEditable: function(context) { + if (context.accounts[0].accounttype == roleTypeUser || context.accounts[0].accounttype == roleTypeDomainAdmin) //updateResourceLimits is only allowed on account whose type is user or domain-admin + return true; + else + return false; + } + }, primaryStorageLimit: { label: 'label.primary.storage.limits', isEditable: function(context) { @@ -733,6 +760,9 @@ case "4": accountObj["templateLimit"] = limit.max; break; + case "6": + accountObj["networkLimit"] = limit.max; + break; case "7": accountObj["vpcLimit"] = limit.max; break;
