etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTAC.K-4923: add missing Network limits in Accounts details page

This commit is contained in:
Wei Zhou 2013-10-22 15:58:17 +02:00
parent 770bfe4354
commit 0f976fd328
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -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

1
ui/dictionary.jsp
View File

@ -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" />',

30
ui/scripts/accounts.js
View File

@ -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;