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

bug 7592: Physical Resources - zone - network - Add Network dialog - remove pod dropdown field.

Browse Source
This commit is contained in:
Jessica Wang 2010-12-21 13:58:15 -08:00
parent bcc327cad1
commit a85343f61f
2 changed files with 1 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/jsp/network.jsp
View File

@ -938,13 +938,7 @@
<option value="account-specific">account-specific</option>
-->
</select>
</li>
<li style="display: none" id="add_publicip_vlan_pod_container">
<label for="user_name">
Pod:</label>
<select class="select" name="add_publicip_vlan_pod" id="add_publicip_vlan_pod">
</select>
</li>
</li>
<li style="display: none" id="add_publicip_vlan_domain_container">
<label for="user_name">
Domain:</label>

21
ui/scripts/cloud.core.network.js
View File

@ -1006,8 +1006,6 @@ function bindAddNetworkButton($button) {
//***** binding Event Handler (begin) ******
$dialogAddNetworkForZone.find("#add_publicip_vlan_network_name_container, #add_publicip_vlan_network_desc_container").show();
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").hide();
$dialogAddNetworkForZone.find("#add_publicip_vlan_scope").empty().append('<option value="zone-wide">zone-wide</option>').append('<option value="account-specific">account-specific</option>');
@ -1048,25 +1046,6 @@ function bindAddNetworkButton($button) {
}
else {
$dialogAddNetworkForZone.find("#add_publicip_vlan_pod_container").show();
var podSelect = $dialogAddNetworkForZone.find("#add_publicip_vlan_pod").empty();
$.ajax({
data: createURL("command=listPods&zoneId="+zoneObj.id),
dataType: "json",
async: false,
success: function(json) {
var pods = json.listpodsresponse.pod;
if (pods != null && pods.length > 0) {
for (var i = 0; i < pods.length; i++) {
podSelect.append("<option value='" + pods[i].id + "'>" + fromdb(pods[i].name) + "</option>");
}
} else {
podSelect.append("<option value=''>No available pods</option>");
}
}
});
var domainSelect = $dialogAddNetworkForZone.find("#add_publicip_vlan_domain").empty();
if(zoneObj.domainid != null) { //list only domains under zoneObj.domainid
domainSelect.append("<option value='" + zoneObj.domainid + "'>" + fromdb(zoneObj.domain) + "</option>");