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 7134: VM Wizard - step 4 - show security group multiple selection box if selected zone is basic-mode.

Browse Source
This commit is contained in:
Jessica Wang 2011-01-10 16:26:14 -08:00
parent 5944ca2316
commit 0403549866
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/jsp/instance.jsp
View File

@ -703,6 +703,19 @@
</div>
</div>
-->
<div id="for_basic_zone" style="display: none">
<h3>Security Groups</h3>
<ol>
<li>
<select id="wizard_security_groups" class="multiple" multiple="multiple" size="15">
</select>
</li>
<li>
(Use <strong>Ctrl-click</strong> to select all applicable security groups)
</li>
</ol>
</div>
</div>
</div>
<div class="vmpopup_navigationpanel">

35
ui/scripts/cloud.core.instance.js
View File

@ -386,13 +386,28 @@ function initVMWizard() {
}
});
$.ajax({
data: createURL("command=listSecurityGroups"+"&domainid="+g_domainid+"&account="+g_account),
dataType: "json",
success: function(json) {
var items = json.listsecuritygroupsresponse.securitygroup;
var $securityGroupSelect = $vmPopup.find("#wizard_security_groups").empty();
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
if(items[i].name != "default")
$securityGroupSelect.append("<option value='" + fromdb(items[i].name) + "'>" + fromdb(items[i].name) + "</option>");
}
}
}
});
$.ajax({
data: createURL("command=listServiceOfferings"),
dataType: "json",
async: false,
success: function(json) {
var offerings = json.listserviceofferingsresponse.serviceoffering;
var $container = $("#service_offering_container");
var $container = $vmPopup.find("#service_offering_container");
$container.empty();
if (offerings != null && offerings.length > 0) {
for (var i = 0; i < offerings.length; i++) {
@ -414,8 +429,8 @@ function initVMWizard() {
async: false,
success: function(json) {
var offerings = json.listdiskofferingsresponse.diskoffering;
var $dataDiskOfferingContainer = $("#data_disk_offering_container").empty();
var $rootDiskOfferingContainer = $("#root_disk_offering_container").empty();
var $dataDiskOfferingContainer = $vmPopup.find("#data_disk_offering_container").empty();
var $rootDiskOfferingContainer = $vmPopup.find("#root_disk_offering_container").empty();
//***** data disk offering: "no, thanks", "custom", existing disk offerings in database (begin) ****************************************************
//"no, thanks" radio button (default radio button in data disk offering)
@ -821,6 +836,7 @@ function initVMWizard() {
//Setup Networking before showing it. This only applies to zones with Advanced Networking support.
var zoneObj = $thisPopup.find("#wizard_zone option:selected").data("zoneObj");
if (zoneObj.networktype == "Advanced") {
$thisPopup.find("#step4").find("#for_basic_zone").hide();
var networkName = "Virtual Network";
var networkDesc = "A dedicated virtualized network for your account. The broadcast domain is contrained within a VLAN and all public network access is routed out by a virtual router.";
$.ajax({
@ -925,8 +941,9 @@ function initVMWizard() {
}
});
$thisPopup.find("#wizard_review_network").text(networkName);
} else {
// Basic Network, show security groups
}
else { // Basic Network, show security groups
$thisPopup.find("#step4").find("#for_basic_zone").show();
$thisPopup.find("#wizard_review_network").text("Basic Network");
}
}
@ -1013,8 +1030,12 @@ function initVMWizard() {
}
}
moreCriteria.push("&networkIds="+networkIds);
} else {
// add security groups
}
else { //zoneObj.networktype == "Basic"
if($thisPopup.find("#wizard_security_groups").val() != null && $thisPopup.find("#wizard_security_groups").val().length > 0) {
var securityGroupList = $thisPopup.find("#wizard_security_groups").val().join(",");
moreCriteria.push("&securitygrouplist="+encodeURIComponent(securityGroupList));
}
}
var diskOfferingId, $diskOfferingElement;