CLOUDSTACK-87 VMs in Expunging state should be excluded from VM listView for staticNat/portForwarding/loadbalance

This commit is contained in:
Mice Xia 2012-09-13 11:05:49 +08:00
parent 8a008ecd16
commit 25e99e9c4d

View File

@ -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;
}
)