From 880ea1fe3f8e29195ad76b5a8a12ce447cfdaebe Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Wed, 8 Jun 2011 18:54:36 -0700
Subject: [PATCH] bug 10199: CloudStack UI - Network Offering page - name field
 is not allowed to be modified.

---
 ui/jsp/networkoffering.jsp               |  4 +---
 ui/scripts/cloud.core.networkoffering.js | 17 ++++++-----------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index b90834da9d1..57074161df2 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -75,9 +75,7 @@ dictionary = {
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="name">
-	                    </div>                    
-	                    <input class="text" id="name_edit" style="width: 200px; display: none;" type="text" />
-	                    <div id="name_edit_errormsg" style="display:none"></div>                       
+	                    </div>         
 	                </div>
 	            </div>
 	            <div class="grid_rows odd">
diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js
index 88bdff64b3e..c1316d18b42 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("#name, #displaytext, #availability");
-    $editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit, #availability_edit");     
+    $readonlyFields  = $("#tab_content_details").find("#displaytext, #availability");
+    $editFields = $("#tab_content_details").find("#displaytext_edit, #availability_edit");     
 }
 
 function doEditNetworkOffering($actionLink, $detailsTab, $midmenuItem1) {       
@@ -64,15 +64,12 @@ function doEditNetworkOffering2($actionLink, $detailsTab, $midmenuItem1, $readon
     var id = jsonObj.id;
     
     // validate values   
-    var isValid = true;					
-    isValid &= validateString("Name", $detailsTab.find("#name_edit"), $detailsTab.find("#name_edit_errormsg"), true);		
+    var isValid = true;			
     isValid &= validateString("Display Text", $detailsTab.find("#displaytext_edit"), $detailsTab.find("#displaytext_edit_errormsg"), true);				
     if (!isValid) 
         return;	
      
-    var array1 = [];    
-    var name = $detailsTab.find("#name_edit").val();
-    array1.push("&name="+todb(name));
+    var array1 = [];       
     
     var displaytext = $detailsTab.find("#displaytext_edit").val();
     array1.push("&displayText="+todb(displaytext));
@@ -156,8 +153,7 @@ function networkOfferingJsonToDetailsTab() {
         
     $thisTab.find("#grid_header_title").text(fromdb(jsonObj.name));
     $thisTab.find("#name").text(fromdb(jsonObj.name));
-    $thisTab.find("#name_edit").val(fromdb(jsonObj.name));
-    
+        
     $thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
     $thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
      
@@ -192,8 +188,7 @@ function networkOfferingClearDetailsTab() {
     var $thisTab = $("#right_panel_content").find("#tab_content_details");     
     $thisTab.find("#id").text("");    
     $thisTab.find("#grid_header_title").text("");
-    $thisTab.find("#name").text("");
-    $thisTab.find("#name_edit").val("");    
+    $thisTab.find("#name").text(""); 
     $thisTab.find("#displaytext").text("");
     $thisTab.find("#displaytext_edit").val("");    
     $thisTab.find("#disksize").text("");