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 7465: removed network type from service offerings.

Browse Source
This commit is contained in:
will 2010-12-09 17:25:23 -08:00
parent e54892290c
commit 6cff798082
2 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ui/jsp/serviceoffering.jsp
View File

@ -133,20 +133,6 @@
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("network.type")%>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="networktype">
</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">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("tags")%>:</div>
@ -159,7 +145,7 @@
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("domain")%>:</div>
@ -172,7 +158,7 @@
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<%=t.t("created")%>:</div>
@ -236,13 +222,6 @@
<option value="true">Yes</option>
</select>
</li>
<li>
<label>Network Type</label>
<select class="select" id="add_service_networktype">
<option value="Direct">Direct</option>
<option value="Public">Public</option>
</select>
</li>
<li id="add_service_tags_container">
<label for="add_service_tags">
Tags:</label>

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

@ -130,10 +130,6 @@ function initAddServiceOfferingDialog() {
var offerha = thisDialog.find("#add_service_offerha").val();
array1.push("&offerha="+offerha);
var networkType = thisDialog.find("#add_service_networktype").val();
var useVirtualNetwork = (networkType=="Direct")? false:true;
array1.push("&usevirtualnetwork="+useVirtualNetwork);
var tags = thisDialog.find("#add_service_tags").val();
if(tags != null && tags.length > 0)
array1.push("&tags="+todb(tags));
@ -207,12 +203,6 @@ function doEditServiceOffering2($actionLink, $detailsTab, $midmenuItem1, $readon
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));
@ -295,9 +285,6 @@ function serviceOfferingJsonToDetailsTab() {
setBooleanReadField(jsonObj.offerha, $thisTab.find("#offerha"));
setBooleanEditField(jsonObj.offerha, $thisTab.find("#offerha_edit"));
$thisTab.find("#networktype").text(toNetworkType(jsonObj.usevirtualnetwork));
$thisTab.find("#networktype").val(toNetworkType(jsonObj.usevirtualnetwork));
$thisTab.find("#tags").text(fromdb(jsonObj.tags));
$thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
@ -333,7 +320,6 @@ function serviceOfferingClearDetailsTab() {
$thisTab.find("#memory").text("");
$thisTab.find("#offerha").text("");
$thisTab.find("#offerha_edit").val("");
$thisTab.find("#networktype").text("");
$thisTab.find("#tags").text("");
$thisTab.find("#created").text("");