From 04be0cdec2ab37bd1975e85dc2c406a6d39b688c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 9 May 2013 14:33:18 -0700 Subject: [PATCH] CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network service providers - show Cisco VNMC in Advanced zone, hide it in Basic zone. --- ui/modules/infrastructure/infrastructure.js | 14 ++++++++------ ui/scripts/system.js | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ui/modules/infrastructure/infrastructure.js b/ui/modules/infrastructure/infrastructure.js index ad43108259b..dae797e39df 100644 --- a/ui/modules/infrastructure/infrastructure.js +++ b/ui/modules/infrastructure/infrastructure.js @@ -33,12 +33,14 @@ $(window).bind('cloudStack.system.serviceProviders.makeHarcodedArray', function(event, data) { var nspHardcodingArray = data.nspHardcodingArray; - - nspHardcodingArray.push({ - id: id, - name: name, - state: state - }); + var selectedZoneObj = data.selectedZoneObj; + if(selectedZoneObj.networktype == "Advanced"){ + nspHardcodingArray.push({ + id: id, + name: name, + state: state + }); + } }); }, diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 6f4e116b4e8..81fda3a71c3 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -12144,7 +12144,8 @@ ]; $(window).trigger('cloudStack.system.serviceProviders.makeHarcodedArray', { - nspHardcodingArray: nspHardcodingArray + nspHardcodingArray: nspHardcodingArray, + selectedZoneObj: selectedZoneObj }); if(selectedZoneObj.networktype == "Basic") {