apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-17 11:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mice Xia 2012-09-13 11:05:49 +08:00
parent 8a008ecd16
commit 25e99e9c4d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/scripts/network.js
View File

@ -909,7 +909,7 @@
data.listvirtualmachinesresponse.virtualmachine : [], data.listvirtualmachinesresponse.virtualmachine : [],
function(instance) { function(instance) {
return $.inArray(instance.state, [ return $.inArray(instance.state, [
'Destroyed' 'Destroyed','Expunging'
]) == -1; ]) == -1;
} }
) )
@ -1477,7 +1477,7 @@
data.listvirtualmachinesresponse.virtualmachine : [], data.listvirtualmachinesresponse.virtualmachine : [],
function(instance) { function(instance) {
return $.inArray(instance.state, [ return $.inArray(instance.state, [
'Destroyed' 'Destroyed','Expunging'
]) == -1; ]) == -1;
} }
) )
@ -2206,7 +2206,7 @@
data.listvirtualmachinesresponse.virtualmachine ? data.listvirtualmachinesresponse.virtualmachine ?
data.listvirtualmachinesresponse.virtualmachine : [], data.listvirtualmachinesresponse.virtualmachine : [],
function(instance) { function(instance) {
var isActiveState = $.inArray(instance.state, ['Destroyed']) == -1; var isActiveState = $.inArray(instance.state, ['Destroyed','Expunging']) == -1;
var notExisting = !$.grep(itemData, function(item) { var notExisting = !$.grep(itemData, function(item) {
return item.id == instance.id; return item.id == instance.id;
}).length; }).length;
@ -2702,7 +2702,7 @@
data.listvirtualmachinesresponse.virtualmachine : [], data.listvirtualmachinesresponse.virtualmachine : [],
function(instance) { function(instance) {
return $.inArray(instance.state, [ return $.inArray(instance.state, [
'Destroyed' 'Destroyed','Expunging'
]) == -1; ]) == -1;
} }
) )