From 1d69a667814499b6243ea5fbb5c83fe6b600960e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 19 Dec 2011 18:01:40 -0800
Subject: [PATCH] bug 12612: cloudStack 3.0 new UI - system - zone chart -
 guest - networks tab (advanced zone) - network detail - Hide "View IP Ranges"
 when a network's type is Isolated with SourceNAT enabled.

---
 ui/scripts/system.js | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 35fd8041cfe..600fa79b565 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -957,7 +957,23 @@
 
                   detailView: {
                     name: 'Guest network details',
-                    viewAll: { path: '_zone.guestIpRanges', label: 'IP ranges' },
+                    viewAll: { 
+										  path: '_zone.guestIpRanges', 
+											label: 'IP ranges',
+                      preFilter: function(args) {                        
+												if(selectedGuestNetworkObj.type == "Isolated") {												  
+													var services = selectedGuestNetworkObj.service;
+													if(services != null) {
+														for(var i=0; i < services.length; i++) {
+																var service = services[i];
+																if(service.name == "sourceNAT")
+																	return false;
+														}
+													}  								  
+												}
+												return true;
+                      }											
+									  },
                     actions: {
                       edit: {
                         label: 'Edit',
@@ -1015,7 +1031,7 @@
 												label: 'Restart network',
 												action: function(args) {												  
 													$.ajax({
-														url: createURL("restartNetwork&id=" + args.context.networks[0].id),
+														url: createURL("restartNetwork&cleanup=true&id=" + args.context.networks[0].id),
 														dataType: "json",
 														async: true,
 														success: function(json) {