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/21 20:33:24 UTC
git commit: CS-16007: Show tier name (associated network name) in
place of VM name
Updated Branches:
refs/heads/master 3f8d9f6b1 -> 93834ea6c
CS-16007: Show tier name (associated network name) in place of VM name
reviewed-by: jessica
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/93834ea6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/93834ea6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/93834ea6
Branch: refs/heads/master
Commit: 93834ea6c605272aef2e022ed0872c6e884892b3
Parents: 3f8d9f6
Author: Brian Federle <br...@citrix.com>
Authored: Tue Aug 21 11:31:23 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Aug 21 11:33:03 2012 -0700
----------------------------------------------------------------------
ui/scripts/vpc.js | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/93834ea6/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 8bb80d0..6c83cf1 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -533,7 +533,16 @@
},
ipAddresses: {
listView: function() {
- return cloudStack.sections.network.sections.ipAddresses;
+ var listView = $.extend(true, {}, cloudStack.sections.network.sections.ipAddresses);
+
+ listView.listView.fields = {
+ ipaddress: listView.listView.fields.ipaddress,
+ zonename: listView.listView.fields.zonename,
+ associatednetworkname: { label: 'label.network.name' },
+ state: listView.listView.fields.state
+ };
+
+ return listView;
}
},
acl: {