Updated Branches: refs/heads/master f35272b6c -> 76d1ee54d
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/master Commit: 76d1ee54ded97836d685539937d7d497e29fa19b Parents: 3bcec62 Author: Brian Federle <[email protected]> Authored: Thu Apr 11 12:28:52 2013 -0700 Committer: Brian Federle <[email protected]> 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 }); }) });
