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 BB3BA18F18 for ; Sat, 28 Nov 2015 21:25:21 +0000 (UTC) Received: (qmail 13744 invoked by uid 500); 28 Nov 2015 21:25:21 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 13699 invoked by uid 500); 28 Nov 2015 21:25:21 -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 13689 invoked by uid 99); 28 Nov 2015 21:25:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Nov 2015 21:25:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5666BDFC89; Sat, 28 Nov 2015 21:25:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Sat, 28 Nov 2015 21:25:21 -0000 Message-Id: <61323a82791c4fc39b57b044f5043a43@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: updated refs/heads/master to e4e685b Repository: cloudstack Updated Branches: refs/heads/master 39a4a9d19 -> e4e685b29 ui: Fix undefined check in instances.js, regression from 459d638 Signed-off-by: Rohit Yadav Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0bbd9a06 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0bbd9a06 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0bbd9a06 Branch: refs/heads/master Commit: 0bbd9a06a97f4e7a0e85cc0f9f015811effad23a Parents: 5b8fc22 Author: Rohit Yadav Authored: Wed Nov 25 14:17:32 2015 +0530 Committer: Rohit Yadav Committed: Wed Nov 25 14:17:32 2015 +0530 ---------------------------------------------------------------------- ui/scripts/instances.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0bbd9a06/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 9d63751..416c77c 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -397,11 +397,13 @@ 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; - } - }); + if (items) { + $.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 });