From 882de014614eb559492eaa24730a5cd473c88326 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 7 Feb 2011 16:56:15 -0800
Subject: [PATCH] Make Offer HA field, Domain field not editable.

---
 ui/jsp/diskoffering.jsp                  |  4 +---
 ui/jsp/serviceoffering.jsp               | 10 ++--------
 ui/scripts/cloud.core.diskoffering.js    |  4 ++--
 ui/scripts/cloud.core.serviceoffering.js |  4 ++--
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp
index 98c2c9712f5..da92aa5f907 100644
--- a/ui/jsp/diskoffering.jsp
+++ b/ui/jsp/diskoffering.jsp
@@ -111,9 +111,7 @@ dictionary = {
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="tags">
-	                    </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>
 	            <div class="grid_rows even">
diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp
index 82f7447e33a..e6188e10ba5 100644
--- a/ui/jsp/serviceoffering.jsp
+++ b/ui/jsp/serviceoffering.jsp
@@ -131,11 +131,7 @@ dictionary = {
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="offerha">
-	                    </div>
-	                    <select class="select" id="offerha_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>
 	            <div class="grid_rows even">
@@ -145,9 +141,7 @@ dictionary = {
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="tags">
-	                    </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>
 	            
diff --git a/ui/scripts/cloud.core.diskoffering.js b/ui/scripts/cloud.core.diskoffering.js
index 5d3223db940..538214a171c 100644
--- a/ui/scripts/cloud.core.diskoffering.js
+++ b/ui/scripts/cloud.core.diskoffering.js
@@ -39,8 +39,8 @@ function diskOfferingGetSearchParams() {
 function afterLoadDiskOfferingJSP() {    
     initAddDiskOfferingDialog();   
     
-    $readonlyFields  = $("#tab_content_details").find("#name, #displaytext, #tags, #domain");
-    $editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit, #domain_edit");       
+    $readonlyFields  = $("#tab_content_details").find("#name, #displaytext");
+    $editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit");       
 }
 
 function initAddDiskOfferingDialog() { 
diff --git a/ui/scripts/cloud.core.serviceoffering.js b/ui/scripts/cloud.core.serviceoffering.js
index 9fa018e48bc..14d89ac3484 100644
--- a/ui/scripts/cloud.core.serviceoffering.js
+++ b/ui/scripts/cloud.core.serviceoffering.js
@@ -39,8 +39,8 @@ function serviceOfferingGetSearchParams() {
 function afterLoadServiceOfferingJSP() {
     initAddServiceOfferingDialog();   
     
-    $readonlyFields = $("#tab_content_details").find("#name, #displaytext, #offerha, #tags, #domain");    
-    $editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit, #offerha_edit, #domain_edit");         
+    $readonlyFields = $("#tab_content_details").find("#name, #displaytext");    
+    $editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit");         
 }
 
 function initAddServiceOfferingDialog() {