You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/04/11 23:22:30 UTC
[07/47] git commit: updated refs/heads/internallb to 3795048
VM NICs list view: Fix 'VM name' field for VMs without name
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76d1ee54
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76d1ee54
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76d1ee54
Branch: refs/heads/internallb
Commit: 76d1ee54ded97836d685539937d7d497e29fa19b
Parents: 3bcec62
Author: Brian Federle <br...@citrix.com>
Authored: Thu Apr 11 12:28:52 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Apr 11 12:29:02 2013 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76d1ee54/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 6c31192..b6ed0fe 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -1554,7 +1554,9 @@
data.queryasyncjobresultresponse.jobresult.nicsecondaryip,
{
zoneid: args.context.instances[0].zoneid,
- virtualmachinedisplayname: args.context.instances[0].displayname
+ virtualmachinedisplayname: args.context.instances[0].displayname ?
+ args.context.instances[0].displayname :
+ args.context.instances[0].name
}
);
},
@@ -1587,7 +1589,9 @@
data: $(ips).map(function(index, ip) {
return $.extend(ip, {
zoneid: args.context.instances[0].zoneid,
- virtualmachinedisplayname: args.context.instances[0].displayname
+ virtualmachinedisplayname: args.context.instances[0].displayname ?
+ args.context.instances[0].displayname :
+ args.context.instances[0].name
});
})
});