CLOUDSTACK-537: cloudstack UI - Advanced SG-enabled zone - VM Wizard - fix a bug that networkID was not passed to API call when selected networks don't include security group service.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/c02801b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/c02801b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/c02801b7 Branch: refs/heads/javelin Commit: c02801b7b786431189b5e5573030d8dea2366d53 Parents: f8e1f59 Author: Jessica Wang <[email protected]> Authored: Tue Jan 29 16:41:14 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Tue Jan 29 16:41:14 2013 -0800 ---------------------------------------------------------------------- ui/scripts/instanceWizard.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/c02801b7/ui/scripts/instanceWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index 070f7e7..35a9b6c 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -18,7 +18,7 @@ (function($, cloudStack) { var zoneObjs, hypervisorObjs, featuredTemplateObjs, communityTemplateObjs, myTemplateObjs, featuredIsoObjs, community, networkObjs; var selectedZoneObj, selectedTemplateObj, selectedHypervisor, selectedDiskOfferingObj; - var step5ContainerType = 'nothing-to-select'; //'nothing-to-select', 'select-network', 'select-security-group' + var step5ContainerType = 'nothing-to-select'; //'nothing-to-select', 'select-network', 'select-security-group', 'select-advanced-sg'(advanced sg-enabled zone) cloudStack.instanceWizard = { maxDiskOfferingSize: function() { @@ -520,7 +520,7 @@ } //step 5: select network - if (step5ContainerType == 'select-network') { + if (step5ContainerType == 'select-network' || step5ContainerType == 'select-advanced-sg') { var array2 = []; var defaultNetworkId = args.data.defaultNetwork; //args.data.defaultNetwork might be equal to string "new-network" or a network ID
