From e34cd2ca4e9dd071365559dd2e640330a965b849 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 15 Feb 2012 16:26:11 -0800 Subject: [PATCH] bug 13629: system page - network providers section - no F5 and SRX for Basic zone. [Reviewed-By: Brian] --- ui/scripts/system.js | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 80d87520e85..0c62af9964c 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -237,17 +237,7 @@ id: 'netscaler', name: 'NetScaler', state: nspMap.netscaler? nspMap.netscaler.state : 'Disabled' - }, - { - id: 'srx', - name: 'SRX', - state: nspMap.srx ? nspMap.srx.state : 'Disabled' - }, - { - id: 'f5', - name: 'F5', - state: nspMap.f5 ? nspMap.f5.state : 'Disabled' - }, + }, { id: 'virtualRouter', name: 'Virtual Router', @@ -256,13 +246,30 @@ ]; if(selectedZoneObj.networktype == "Basic") { - networkProviderData.push({ + 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' + } + ); + } args.response.success({ data: networkProviderData