From 3a8ab080ffb4077ee9283fec02551dba16a6a485 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 14 Dec 2010 14:55:40 -0800
Subject: [PATCH] Network Offering page - implement "Edit Network Offering".

---
 ui/jsp/networkoffering.jsp               |  7 ++++++-
 ui/scripts/cloud.core.networkoffering.js | 20 +++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp
index 194a0c1ea07..d28bd3af6ee 100644
--- a/ui/jsp/networkoffering.jsp
+++ b/ui/jsp/networkoffering.jsp
@@ -97,7 +97,12 @@
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="availability">
-	                    </div>
+	                    </div>	                    
+	                    <select class="select" id="availability_edit" style="width: 202px; display: none;">
+	                        <option value="Required">Required</option>
+							<option value="Optional">Optional</option>
+							<option value="Unavailable">Unavailable</option>
+	                    </select>	                    
 	                </div>
 	            </div>
 	            
diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js
index 4fa4795f461..708e7e7a018 100644
--- a/ui/scripts/cloud.core.networkoffering.js
+++ b/ui/scripts/cloud.core.networkoffering.js
@@ -46,8 +46,8 @@ function afterLoadNetworkOfferingJSP() {
 }
 
 function doEditNetworkOffering($actionLink, $detailsTab, $midmenuItem1) {       
-    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #tags, #domain");
-    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #domain_edit"); 
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #availability");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #availability_edit"); 
              
     $readonlyFields.hide();
     $editFields.show();  
@@ -83,17 +83,14 @@ function doEditNetworkOffering2($actionLink, $detailsTab, $midmenuItem1, $readon
     var displaytext = $detailsTab.find("#displaytext_edit").val();
     array1.push("&displayText="+todb(displaytext));
 	
-	var tags = $detailsTab.find("#tags_edit").val();
-	array1.push("&tags="+todb(tags));	
-	
-	var domainid = $detailsTab.find("#domain_edit").val();
-	array1.push("&domainid="+todb(domainid));	
+	var availability = $detailsTab.find("#availability_edit").val();
+    array1.push("&availability="+todb(availability));	
 	
 	$.ajax({
 	    data: createURL("command=updateNetworkOffering&id="+id+array1.join("")),
 		dataType: "json",
 		success: function(json) {			    
-		    var jsonObj = json.updateNetworkOfferingresponse.NetworkOffering;   
+		    var jsonObj = json.updateNetworkOfferingresponse.networkoffering;   		    
 		    networkOfferingToMidmenu(jsonObj, $midmenuItem1);
 		    networkOfferingToRightPanel($midmenuItem1);	
 		    
@@ -156,12 +153,13 @@ 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("#name_edit").val(fromdb(jsonObj.name));
     
     $thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
-    //$thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
+    $thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
      
-    $thisTab.find("#availability").text(fromdb(jsonObj.availability)); 
+    $thisTab.find("#availability").text(fromdb(jsonObj.availability));     
+    $thisTab.find("#availability_edit").val(fromdb(jsonObj.availability)); 
      
     setBooleanReadField(jsonObj.isdefault, $thisTab.find("#isdefault"));
     setBooleanReadField(jsonObj.specifyvlan, $thisTab.find("#specifyvlan"));