etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x

This commit is contained in:
Vijayendra Bhamidipati 2012-08-17 12:31:03 -07:00
parent 4d7c6f43ac a38704902e
commit fb720ee41b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/scripts/network.js
View File

@ -2204,12 +2204,20 @@
data.listvirtualmachinesresponse.virtualmachine ?
data.listvirtualmachinesresponse.virtualmachine : [],
function(instance) {
// Hiding the AutoScale VMs
var nonAutoScale=0;
if( instance.name.match(/AutoScale-LB-/)==null)
nonAutoScale =1;
else {
if(instance.name.match(/AutoScale-LB-/).length)
nonAutoScale =0;
}
var isActiveState = $.inArray(instance.state, ['Destroyed']) == -1;
var notExisting = !$.grep(itemData, function(item) {
return item.id == instance.id;
}).length;
}).length;
return isActiveState && notExisting;
return nonAutoScale && isActiveState && notExisting ;
}
);