From 08fc2b2bedd9f49383d4306f7c50e8f8acf47e73 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 15 Jun 2011 18:14:29 -0700
Subject: [PATCH] CloudStack UI - network offering page - "is redundant router
 (yes/no)" shouldn't allowed to be modified.

---
 ui/jsp/networkoffering.jsp               |  6 +-----
 ui/scripts/cloud.core.networkoffering.js | 13 ++++---------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index e2ee3c8aa96..689854935e8 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -114,11 +114,7 @@ dictionary = {
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="redundantrouter">
-	                    </div>
-	                    <select class="select" id="redundantrouter_edit" style="width: 202px; display: none;">
-	                        <option value="false"><fmt:message key="label.no"/></option>
-							<option value="true"><fmt:message key="label.yes"/></option>
-	                    </select>
+	                    </div>	                   
 	                </div>
 	            </div>
 	            	            
diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js
index 738144f139b..3811d5ab184 100644
--- a/ui/scripts/cloud.core.networkoffering.js
+++ b/ui/scripts/cloud.core.networkoffering.js
@@ -40,8 +40,8 @@ function networkOfferingGetSearchParams() {
 }
 
 function afterLoadNetworkOfferingJSP() {   
-    $readonlyFields  = $("#tab_content_details").find("#displaytext, #availability, #redundantrouter");
-    $editFields = $("#tab_content_details").find("#displaytext_edit, #availability_edit, #redundantrouter_edit");     
+    $readonlyFields  = $("#tab_content_details").find("#displaytext, #availability");
+    $editFields = $("#tab_content_details").find("#displaytext_edit, #availability_edit");     
 }
 
 function doEditNetworkOffering($actionLink, $detailsTab, $midmenuItem1) {       
@@ -76,10 +76,7 @@ function doEditNetworkOffering2($actionLink, $detailsTab, $midmenuItem1, $readon
 	
 	var availability = $detailsTab.find("#availability_edit").val();
     array1.push("&availability="+todb(availability));	
-	
-    var redundantrouter = $detailsTab.find("#redundantrouter_edit").val();     
-	array1.push("&redundantrouter="+redundantrouter);	
-    
+	    
 	$.ajax({
 	    data: createURL("command=updateNetworkOffering&id="+id+array1.join("")),
 		dataType: "json",
@@ -163,9 +160,7 @@ function networkOfferingJsonToDetailsTab() {
     $thisTab.find("#availability").text(fromdb(jsonObj.availability));     
     $thisTab.find("#availability_edit").val(fromdb(jsonObj.availability)); 
          
-    setBooleanReadField(jsonObj.redundantrouter, $thisTab.find("#redundantrouter"));	
-    setBooleanEditField(jsonObj.redundantrouter, $thisTab.find("#redundantrouter_edit"));
-    
+    setBooleanReadField(jsonObj.redundantrouter, $thisTab.find("#redundantrouter"));	    
     setBooleanReadField(jsonObj.isdefault, $thisTab.find("#isdefault"));
     setBooleanReadField(jsonObj.specifyvlan, $thisTab.find("#specifyvlan"));