Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6FBA103B7 for ; Thu, 11 Apr 2013 19:37:16 +0000 (UTC) Received: (qmail 8933 invoked by uid 500); 11 Apr 2013 19:35:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 3194 invoked by uid 500); 11 Apr 2013 19:34:46 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 61327 invoked by uid 99); 11 Apr 2013 19:29:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 19:29:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 96147880BE9; Thu, 11 Apr 2013 19:29:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Thu, 11 Apr 2013 19:29:16 -0000 Message-Id: <3a6b0bb159f3442199906b17329695fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to 76d1ee5 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 Authored: Thu Apr 11 12:28:52 2013 -0700 Committer: Brian Federle 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 }); }) });