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

bug 13629: system page - network providers section - basic zone: no F5 and SRX.

This commit is contained in:
Jessica Wang 2012-02-15 16:24:45 -08:00 committed by Salvatore Orlando
parent 701352add1
commit a808035b3d
1 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui/scripts/system.js
View File

@ -353,7 +353,53 @@
}
},
dataProvider: function(args) {
<<<<<<< HEAD
refreshNspData();
=======
cloudStack.sections.system.naas.networkProviders.statusCheck({
context: args.context
});
var networkProviderData = [
{
id: 'netscaler',
name: 'NetScaler',
state: nspMap.netscaler? nspMap.netscaler.state : 'Disabled'
},
{
id: 'virtualRouter',
name: 'virtual.router',
state: nspMap.virtualRouter ? nspMap.virtualRouter.state : 'Disabled'
}
];
if(selectedZoneObj.networktype == "Basic") {
networkProviderData.push(
{
id: 'securityGroups',
name: 'Security Groups',
state: nspMap.securityGroups ? nspMap.securityGroups.state : 'Disabled'
}
);
}
else if(selectedZoneObj.networktype == "Advanced"){
networkProviderData.push(
{
id: 'f5',
name: 'F5',
state: nspMap.f5 ? nspMap.f5.state : 'Disabled'
}
);
networkProviderData.push(
{
id: 'srx',
name: 'SRX',
state: nspMap.srx ? nspMap.srx.state : 'Disabled'
}
);
}
>>>>>>> 07dc16c... bug 13629: system page - network providers section - basic zone: no F5 and SRX.
args.response.success({
data: nspHardcodingArray
})