You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mi...@apache.org on 2012/08/16 14:28:28 UTC
git commit: Fix a bug,
failed to show resource limit page in project view due to missing vpc
limit type
Updated Branches:
refs/heads/master 938498c7f -> 5dcf639ac
Fix a bug, failed to show resource limit page in project view due to missing vpc limit type
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5dcf639a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5dcf639a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5dcf639a
Branch: refs/heads/master
Commit: 5dcf639acc54015b7c98484ecb04b91c63599b14
Parents: 938498c
Author: Mice Xia <mi...@apache.org>
Authored: Thu Aug 16 17:49:29 2012 +0800
Committer: Mice Xia <mi...@apache.org>
Committed: Thu Aug 16 20:17:42 2012 +0800
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 1 +
ui/index.jsp | 1 +
ui/scripts/projects.js | 6 +++++-
3 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5dcf639a/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 13517ab..b4f09f2 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -227,6 +227,7 @@ label.max.public.ips=Max. public IPs
label.max.volumes=Max. volumes
label.max.snapshots=Max. snapshots
label.max.templates=Max. templates
+label.max.vpcs=Max. VPCs
label.project.dashboard=Project dashboard
label.remind.later=Remind me later
label.invited.accounts=Invited accounts
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5dcf639a/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 2d8b8d6..e8f37bf 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1791,6 +1791,7 @@ dictionary = {
'label.max.volumes': '<fmt:message key="label.max.volumes"/>',
'label.max.snapshots': '<fmt:message key="label.max.snapshots"/>',
'label.max.templates': '<fmt:message key="label.max.templates"/>',
+'label.max.vpcs': '<fmt:message key="label.max.vpcs"/>',
'label.remind.later': '<fmt:message key="label.remind.later"/>',
'label.invited.accounts': '<fmt:message key="label.invited.accounts"/>',
'label.add.accounts.to': '<fmt:message key="label.add.accounts.to"/>',
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5dcf639a/ui/scripts/projects.js
----------------------------------------------------------------------
diff --git a/ui/scripts/projects.js b/ui/scripts/projects.js
index 293a2b0..f7de88f 100644
--- a/ui/scripts/projects.js
+++ b/ui/scripts/projects.js
@@ -107,7 +107,11 @@
6: {
id: 'network',
label: 'label.max.networks'
- }
+ },
+ 7: {
+ id: 'vpc',
+ label: 'label.max.vpcs'
+ }
};
return {