CLOUDSTACK-1816: Cisco VNMC ASA1000v - UI - Infrastructure menu - network 
service providers - show Cisco VNMC in Advanced zone, hide it in Basic zone.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04be0cde
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04be0cde
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04be0cde

Branch: refs/heads/master
Commit: 04be0cdec2ab37bd1975e85dc2c406a6d39b688c
Parents: ea4cb0e
Author: Jessica Wang <[email protected]>
Authored: Thu May 9 14:33:18 2013 -0700
Committer: Jessica Wang <[email protected]>
Committed: Thu May 9 14:33:18 2013 -0700

----------------------------------------------------------------------
 ui/modules/infrastructure/infrastructure.js |   14 ++++++++------
 ui/scripts/system.js                        |    3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04be0cde/ui/modules/infrastructure/infrastructure.js
----------------------------------------------------------------------
diff --git a/ui/modules/infrastructure/infrastructure.js 
b/ui/modules/infrastructure/infrastructure.js
index ad43108..dae797e 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
+            });
+          } 
         });
       },
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/04be0cde/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 6f4e116..81fda3a 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") {

Reply via email to