Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52DCDD724 for ; Thu, 13 Sep 2012 18:43:54 +0000 (UTC) Received: (qmail 90237 invoked by uid 500); 13 Sep 2012 18:43:50 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 90126 invoked by uid 500); 13 Sep 2012 18:43:50 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 89680 invoked by uid 99); 13 Sep 2012 18:43:49 -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, 13 Sep 2012 18:43:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7F40E36540; Thu, 13 Sep 2012 18:43:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [27/50] [abbrv] git commit: CLOUDSTACK-87 VMs in Expunging state should be excluded from VM listView for staticNat/portForwarding/loadbalance Message-Id: <20120913184349.7F40E36540@tyr.zones.apache.org> Date: Thu, 13 Sep 2012 18:43:49 +0000 (UTC) CLOUDSTACK-87 VMs in Expunging state should be excluded from VM listView for staticNat/portForwarding/loadbalance Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/25e99e9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/25e99e9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/25e99e9c Branch: refs/heads/javelin Commit: 25e99e9c4db403076a98e9ca64a02de5087c92dc Parents: 8a008ec Author: Mice Xia Authored: Thu Sep 13 11:05:49 2012 +0800 Committer: Mice Xia Committed: Thu Sep 13 11:21:11 2012 +0800 ---------------------------------------------------------------------- ui/scripts/network.js | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/25e99e9c/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 3bb3922..1a7769a 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -909,7 +909,7 @@ data.listvirtualmachinesresponse.virtualmachine : [], function(instance) { return $.inArray(instance.state, [ - 'Destroyed' + 'Destroyed','Expunging' ]) == -1; } ) @@ -1477,7 +1477,7 @@ data.listvirtualmachinesresponse.virtualmachine : [], function(instance) { return $.inArray(instance.state, [ - 'Destroyed' + 'Destroyed','Expunging' ]) == -1; } ) @@ -2206,7 +2206,7 @@ data.listvirtualmachinesresponse.virtualmachine ? data.listvirtualmachinesresponse.virtualmachine : [], function(instance) { - var isActiveState = $.inArray(instance.state, ['Destroyed']) == -1; + var isActiveState = $.inArray(instance.state, ['Destroyed','Expunging']) == -1; var notExisting = !$.grep(itemData, function(item) { return item.id == instance.id; }).length; @@ -2702,7 +2702,7 @@ data.listvirtualmachinesresponse.virtualmachine : [], function(instance) { return $.inArray(instance.state, [ - 'Destroyed' + 'Destroyed','Expunging' ]) == -1; } )