apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 6433: make tags field in service offering page editable.

Browse Source
This commit is contained in:
Jessica Wang 2010-11-15 10:01:46 -08:00
parent 408b80bd90
commit 863a94d3d2
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/jsp/serviceoffering.jsp
View File

@ -140,6 +140,10 @@
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="networktype"> <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> </div>
<div class="grid_rows odd"> <div class="grid_rows odd">
@ -150,6 +154,8 @@
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="tags"> <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> </div>
<div class="grid_rows even"> <div class="grid_rows even">

22
ui/scripts/cloud.core.serviceoffering.js
View File

@ -79,7 +79,7 @@ function afterLoadServiceOfferingJSP() {
array1.push("&offerha="+offerha); array1.push("&offerha="+offerha);
var networkType = thisDialog.find("#add_service_networktype").val(); var networkType = thisDialog.find("#add_service_networktype").val();
var useVirtualNetwork = (networkType=="direct")? false:true; var useVirtualNetwork = (networkType=="Direct")? false:true;
array1.push("&usevirtualnetwork="+useVirtualNetwork); array1.push("&usevirtualnetwork="+useVirtualNetwork);
var tags = trim(thisDialog.find("#add_service_tags").val()); var tags = trim(thisDialog.find("#add_service_tags").val());
@ -112,8 +112,10 @@ function afterLoadServiceOfferingJSP() {
} }
function doEditServiceOffering($actionLink, $detailsTab, $midmenuItem1) { function doEditServiceOffering($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields = $detailsTab.find("#name, #displaytext, #offerha"); //var $readonlyFields = $detailsTab.find("#name, #displaytext, #offerha, #networktype, #tags");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #offerha_edit"); 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(); $readonlyFields.hide();
$editFields.show(); $editFields.show();
@ -151,6 +153,15 @@ function doEditServiceOffering2($actionLink, $detailsTab, $midmenuItem1, $readon
var offerha = $detailsTab.find("#offerha_edit").val(); var offerha = $detailsTab.find("#offerha_edit").val();
array1.push("&offerha="+offerha); 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({ $.ajax({
data: createURL("command=updateServiceOffering&id="+id+array1.join("")), data: createURL("command=updateServiceOffering&id="+id+array1.join("")),
dataType: "json", dataType: "json",
@ -220,10 +231,13 @@ function serviceOfferingJsonToDetailsTab() {
setBooleanReadField(jsonObj.offerha, $thisTab.find("#offerha")); setBooleanReadField(jsonObj.offerha, $thisTab.find("#offerha"));
setBooleanEditField(jsonObj.offerha, $thisTab.find("#offerha_edit")); setBooleanEditField(jsonObj.offerha, $thisTab.find("#offerha_edit"));
//$thisTab.find("#offerha_edit").val(jsonObj.offerha);
$thisTab.find("#networktype").text(toNetworkType(jsonObj.usevirtualnetwork)); $thisTab.find("#networktype").text(toNetworkType(jsonObj.usevirtualnetwork));
$thisTab.find("#networktype").val(toNetworkType(jsonObj.usevirtualnetwork));
$thisTab.find("#tags").text(fromdb(jsonObj.tags)); $thisTab.find("#tags").text(fromdb(jsonObj.tags));
$thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
setDateField(jsonObj.created, $thisTab.find("#created")); setDateField(jsonObj.created, $thisTab.find("#created"));
//actions *** //actions ***