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

Mice Xia · Mice Xia · commit 25e99e9c4db4 · 2012-09-13T11:21:11.000+08:00
diff --git 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;
                                   }
                                 )

Original file line number	Diff line number	Diff line change
`@@ -909,7 +909,7 @@`
`909`	`909`	`data.listvirtualmachinesresponse.virtualmachine : [],`
`910`	`910`	`function(instance) {`
`911`	`911`	`return $.inArray(instance.state, [`
`912`		`- 'Destroyed'`
	`912`	`+ 'Destroyed','Expunging'`
`913`	`913`	`]) == -1;`
`914`	`914`	`}`
`915`	`915`	`)`
`@@ -1477,7 +1477,7 @@`
`1477`	`1477`	`data.listvirtualmachinesresponse.virtualmachine : [],`
`1478`	`1478`	`function(instance) {`
`1479`	`1479`	`return $.inArray(instance.state, [`
`1480`		`- 'Destroyed'`
	`1480`	`+ 'Destroyed','Expunging'`
`1481`	`1481`	`]) == -1;`
`1482`	`1482`	`}`
`1483`	`1483`	`)`
`@@ -2206,7 +2206,7 @@`
`2206`	`2206`	`data.listvirtualmachinesresponse.virtualmachine ?`
`2207`	`2207`	`data.listvirtualmachinesresponse.virtualmachine : [],`
`2208`	`2208`	`function(instance) {`
`2209`		`- var isActiveState = $.inArray(instance.state, ['Destroyed']) == -1;`
	`2209`	`+ var isActiveState = $.inArray(instance.state, ['Destroyed','Expunging']) == -1;`
`2210`	`2210`	`var notExisting = !$.grep(itemData, function(item) {`
`2211`	`2211`	`return item.id == instance.id;`
`2212`	`2212`	`}).length;`
`@@ -2702,7 +2702,7 @@`
`2702`	`2702`	`data.listvirtualmachinesresponse.virtualmachine : [],`
`2703`	`2703`	`function(instance) {`
`2704`	`2704`	`return $.inArray(instance.state, [`
`2705`		`- 'Destroyed'`
	`2705`	`+ 'Destroyed','Expunging'`
`2706`	`2706`	`]) == -1;`
`2707`	`2707`	`}`
`2708`	`2708`	`)`