You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/08/10 01:15:57 UTC
[3/3] git commit: CS-15913: Add state column to VPN connection listing
CS-15913: Add state column to VPN connection listing
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/df4a4a6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/df4a4a6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/df4a4a6b
Branch: refs/heads/vpc
Commit: df4a4a6b2164bfd671f50229a65b87bb7e789cfd
Parents: 241d83a
Author: Brian Federle <br...@citrix.com>
Authored: Thu Aug 9 16:13:20 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Aug 9 16:15:29 2012 -0700
----------------------------------------------------------------------
ui/scripts/vpc.js | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/df4a4a6b/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 1529542..d34025a 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -906,7 +906,14 @@
fields: {
publicip: { label: 'label.ip.address' },
gateway: { label: 'label.gateway' },
- cidrlist: { label: 'CIDR list' },
+ state: {
+ label: 'label.state',
+ indicator: {
+ 'Connected': 'on',
+ 'Disconnected': 'off',
+ 'Error': 'off'
+ }
+ },
ipsecpsk: { label: 'IPsec Preshared-Key' },
ikepolicy: { label: 'IKE policy' },
esppolicy: { label: 'ESP policy' }
@@ -1012,7 +1019,7 @@
);
}
});
- },
+ },
notification: {
poll: pollAsyncJobResult
}