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

CLOUDSTACK-537: Fix for instance wizard

Browse Source 
When using SG-enabled advanced zone, fix case where 'add guest
network' form shows up in select network step -- adding a guest
network via the wizard is not supported in this type of setup.
This commit is contained in:
Brian Federle 2013-01-21 14:30:56 -08:00
parent 6db719d58b
commit a4c413bc13
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/css/cloudstack3.css
View File

@ -5778,6 +5778,10 @@ label.error {
height: 223px; height: 223px;
} }
.multi-wizard.instance-wizard .select-network.no-add-network .select table .select-container {
height: 282px;
}
.multi-wizard.instance-wizard .select-network .select.new-network table .select-container { .multi-wizard.instance-wizard .select-network .select.new-network table .select-container {
height: 29px; height: 29px;
overflow: visible; overflow: visible;
@ -5802,6 +5806,10 @@ label.error {
margin: -17px 0 0; margin: -17px 0 0;
} }
.multi-wizard.instance-wizard .select-network.no-add-network .select.new-network {
display: none !important;
}
.multi-wizard.instance-wizard .select-network .main-desc { .multi-wizard.instance-wizard .select-network .main-desc {
width: 252px; width: 252px;
top: 12px; top: 12px;

8
ui/scripts/instanceWizard.js
View File

@ -284,6 +284,7 @@
$networkStep.find("#from_instance_page_2").show(); $networkStep.find("#from_instance_page_2").show();
$networkStep.find("#from_vpc_tier").text(""); $networkStep.find("#from_vpc_tier").text("");
$networkStep.find("#from_vpc_tier").hide(); $networkStep.find("#from_vpc_tier").hide();
$networkStepContainer.removeClass('next-use-security-groups');
} else { // Advanced SG-enabled zone } else { // Advanced SG-enabled zone
step5ContainerType = 'select-advanced-sg'; step5ContainerType = 'select-advanced-sg';
} }
@ -384,8 +385,15 @@
}); });
//get network offerings (end) *** //get network offerings (end) ***
$networkStepContainer.removeClass('repeat next-use-security-groups');
if (step5ContainerType == 'select-advanced-sg') { if (step5ContainerType == 'select-advanced-sg') {
$networkStepContainer.addClass('repeat next-use-security-groups'); $networkStepContainer.addClass('repeat next-use-security-groups');
// Add guest network is disabled
$networkStepContainer.find('.select-network').addClass('no-add-network');
} else {
$networkStepContainer.find('.select-network').removeClass('no-add-network');
} }
args.response.success({ args.response.success({