You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/08/15 23:14:09 UTC
[2/20] git commit: cloudstack 3.0 UI - IP Address page - detailView -
Network Name is referring to name of associated network.
cloudstack 3.0 UI - IP Address page - detailView - Network Name is referring to name of associated network.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c087c562
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c087c562
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c087c562
Branch: refs/heads/4.0
Commit: c087c5626c944b405e9e9dd15fe9f8aa7743fc50
Parents: f8886ce
Author: Jessica Wang <je...@citrix.com>
Authored: Wed Aug 15 11:25:39 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Wed Aug 15 14:10:48 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c087c562/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 65917f6..a1bf726 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1658,11 +1658,11 @@
ipaddress: { label: 'IP' }
},
{
- id: { label: 'label.id' },
- networkname: { label: 'label.network.name' },
- networkid: { label: 'label.network.id' },
+ id: { label: 'label.id' },
associatednetworkid: { label: 'label.associated.network.id' },
+ networkname: { label: 'Associated Network' },
state: { label: 'label.state' },
+ networkid: { label: 'label.network.id' },
issourcenat: { label: 'label.source.nat', converter: cloudStack.converters.toBooleanText },
isstaticnat: { label: 'label.static.nat', converter: cloudStack.converters.toBooleanText },
issystem: { label: 'label.is.system', converter: cloudStack.converters.toBooleanText }, //(basic zone only)