incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [27/50] [abbrv] git commit: CLOUDSTACK-87 VMs in Expunging state should be excluded from VM listView for staticNat/portForwarding/loadbalance
Date Thu, 13 Sep 2012 18:43:49 GMT
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 <mice_xia@tcloudcomputing.com>
Authored: Thu Sep 13 11:05:49 2012 +0800
Committer: Mice Xia <mice_xia@tcloudcomputing.com>
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;
                                   }
                                 )


Mime
View raw message