Updated Branches: refs/heads/master 6db719d58 -> a4c413bc1
CLOUDSTACK-537: Fix for instance wizard 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. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a4c413bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a4c413bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a4c413bc Branch: refs/heads/master Commit: a4c413bc13cae8d6060a4bfd58fb2d6a18bebbc7 Parents: 6db719d Author: Brian Federle <[email protected]> Authored: Mon Jan 21 14:30:56 2013 -0800 Committer: Brian Federle <[email protected]> Committed: Mon Jan 21 14:30:56 2013 -0800 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 8 ++++++++ ui/scripts/instanceWizard.js | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a4c413bc/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 58563a6..db101d2 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -5778,6 +5778,10 @@ label.error { 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 { height: 29px; overflow: visible; @@ -5802,6 +5806,10 @@ label.error { 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 { width: 252px; top: 12px; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a4c413bc/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index b98147b..f3fe6a5 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -284,6 +284,7 @@ $networkStep.find("#from_instance_page_2").show(); $networkStep.find("#from_vpc_tier").text(""); $networkStep.find("#from_vpc_tier").hide(); + $networkStepContainer.removeClass('next-use-security-groups'); } else { // Advanced SG-enabled zone step5ContainerType = 'select-advanced-sg'; } @@ -384,8 +385,15 @@ }); //get network offerings (end) *** + $networkStepContainer.removeClass('repeat next-use-security-groups'); + if (step5ContainerType == 'select-advanced-sg') { $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({
