You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/11/19 12:23:14 UTC
[6/9] git commit: updated refs/heads/master to fe2917e
CLOUDSTACK-9020: add ipaddress in instances view
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/459d6380
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/459d6380
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/459d6380
Branch: refs/heads/master
Commit: 459d6380b8b0fe7a8437df3c137b7ae5db4cddd3
Parents: 4830334
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Sat Nov 7 16:50:08 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 19 15:17:44 2015 +0530
----------------------------------------------------------------------
ui/scripts/instances.js | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/459d6380/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 8e21c81..2b7576c 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -170,6 +170,9 @@
label: 'label.display.name',
truncate: true
},
+ ipaddress: {
+ label: 'label.ip.address'
+ },
zonename: {
label: 'label.zone.name'
},
@@ -394,6 +397,11 @@
data: data,
success: function(json) {
var items = json.listvirtualmachinesresponse.virtualmachine;
+ $.each(items, function(idx, vm) {
+ if (vm.nic && vm.nic.length > 0 && vm.nic[0].ipaddress) {
+ items[idx].ipaddress = vm.nic[0].ipaddress;
+ }
+ });
args.response.success({
data: items
});