From 863a94d3d24cfe61e26b003268212bba217ce7d9 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 15 Nov 2010 10:01:46 -0800
Subject: [PATCH] bug 6433: make tags field in service offering page editable.

---
 ui/jsp/serviceoffering.jsp               | 10 ++++++++--
 ui/scripts/cloud.core.serviceoffering.js | 24 +++++++++++++++++++-----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 2dfeb479626..f82944f82f8 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -139,7 +139,11 @@
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="networktype">
-	                    </div>
+	                    </div>	                    
+	                    <select class="select" id="networktype_edit" style="width: 202px; display: none;">
+	                        <option value="Direct">Direct</option>
+							<option value="Public">Public</option>	
+	                    </select>	
 	                </div>
 	            </div>
 	            <div class="grid_rows odd">
@@ -149,7 +153,9 @@
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="tags">
-	                    </div>
+	                    </div>	                    
+	                    <input class="text" id="tags_edit" style="width: 200px; display: none;" type="text" />
+	                    <div id="tags_edit_errormsg" style="display:none"></div>  
 	                </div>
 	            </div>
 	            <div class="grid_rows even">
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index 24bedd00a5f..01b5c1ced23 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -79,7 +79,7 @@ function afterLoadServiceOfferingJSP() {
 				array1.push("&offerha="+offerha);								
 									
 				var networkType = thisDialog.find("#add_service_networktype").val();
-				var useVirtualNetwork = (networkType=="direct")? false:true;
+				var useVirtualNetwork = (networkType=="Direct")? false:true;
 				array1.push("&usevirtualnetwork="+useVirtualNetwork);		
 				
 				var tags = trim(thisDialog.find("#add_service_tags").val());
@@ -112,8 +112,10 @@ function afterLoadServiceOfferingJSP() {
 }
 
 function doEditServiceOffering($actionLink, $detailsTab, $midmenuItem1) {       
-    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #offerha");
-    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #offerha_edit"); 
+    //var $readonlyFields  = $detailsTab.find("#name, #displaytext, #offerha, #networktype, #tags");
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #offerha, #tags");
+    //var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #offerha_edit, #networktype_edit, #tags_edit");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #offerha_edit, #tags_edit");
              
     $readonlyFields.hide();
     $editFields.show();  
@@ -150,6 +152,15 @@ function doEditServiceOffering2($actionLink, $detailsTab, $midmenuItem1, $readon
     array1.push("&displayText="+todb(displaytext));
     var offerha = $detailsTab.find("#offerha_edit").val();   
     array1.push("&offerha="+offerha);		
+
+    /*
+	var networkType = $detailsTab.find("#networktype_edit").val();
+	var useVirtualNetwork = (networkType=="Direct")? false:true;
+	array1.push("&usevirtualnetwork="+useVirtualNetwork);
+	*/		
+	
+	var tags = $detailsTab.find("#tags_edit").val();
+	array1.push("&tags="+todb(tags));	
 	
 	$.ajax({
 	    data: createURL("command=updateServiceOffering&id="+id+array1.join("")),
@@ -220,10 +231,13 @@ function serviceOfferingJsonToDetailsTab() {
     
     setBooleanReadField(jsonObj.offerha, $thisTab.find("#offerha"));	
     setBooleanEditField(jsonObj.offerha, $thisTab.find("#offerha_edit"));
-    //$thisTab.find("#offerha_edit").val(jsonObj.offerha);
     
     $thisTab.find("#networktype").text(toNetworkType(jsonObj.usevirtualnetwork));
-    $thisTab.find("#tags").text(fromdb(jsonObj.tags));   
+    $thisTab.find("#networktype").val(toNetworkType(jsonObj.usevirtualnetwork));
+    
+    $thisTab.find("#tags").text(fromdb(jsonObj.tags)); 
+    $thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
+      
     setDateField(jsonObj.created, $thisTab.find("#created"));	
     
     //actions ***