bug 12533

Disable 'Public' network area if in a basic zone

status 12533: fixed resolved

ui/css/cloudstack3.css

@@ -3636,6 +3636,12 @@ Dialogs*/
   top: 11px;
 }
 
+.zone-chart ul li.disabled .name {
+  color: #AAAAAA;
+  text-decoration: line-through;
+  margin-top: 10px;
+}
+
 .zone-chart ul li .view-all,
 .zone-chart ul li .view-details {
   /*+placement:anchor-bottom-right 5px 11px;*/
@@ -3744,6 +3750,9 @@ Dialogs*/
   text-align: center;
 }
 
+.zone-chart .resources.naas ul.system-main li.main.disabled {
+}
+
 .zone-chart .resources.naas ul.system-main li.main .view-all {
   /*+placement:shift 65px 29px;*/
   position: relative;
@@ -3754,6 +3763,10 @@ Dialogs*/
   text-indent: -2px;
 }
 
+.zone-chart .resources.naas ul.system-main li.main.disabled .view-all {
+  display: none;
+}
+
 .zone-chart .resources.naas ul.system-main li.main.public {
   /*+placement:shift 153px 2px;*/
   position: relative;

ui/scripts/system.js

@@ -125,6 +125,14 @@
 
     // Network-as-a-service configuration
     naas: {
+      mainNetworksPreFilter: function(args) {
+        if (args.context.physicalResources[0].networktype == 'Basic') {
+          return ['public'];
+        }
+
+        return [];
+      },
+
       mainNetworks: {
         'public': {
           detailView: {

ui/scripts/ui-custom/zoneChart.js

@@ -286,6 +286,19 @@
                   $tooltip.animate({ opacity: 0 }, { queue: false });
                 });
 
+                // Main items pre-filter
+                if (naas.mainNetworksPreFilter) {
+                  var disabledNetworks = naas.mainNetworksPreFilter({
+                    context: context
+                  });
+
+                  $(disabledNetworks).each(function() {
+                    var $item = $tabContent.find('li.main[rel=' + this + ']');
+
+                    $item.addClass('disabled');
+                  });
+                }
+
                 // Main items configure event
                 $tabContent.find('li.main .view-all.configure').click(function() {
                   var itemID = $(this).closest('li').attr('rel');