From 373525f34575541dd12fcedbf3f1475e450e0b78 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 17 Feb 2011 16:17:59 -0800 Subject: [PATCH] bug 8635: similar bug shows after hitting Submit button in step 5. (Fix: when virtual network container is hidden (e.g. when defaultVirtualizedNetworkOffering.availability is Unavailable), get checked radio buttons from only direct network container.) --- ui/scripts/cloud.core.instance.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index ed68830b2fd..a810673d4cb 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1089,8 +1089,13 @@ function initVMWizard() { moreCriteria.push("&serviceOfferingId="+$thisPopup.find("input:radio[name=service_offering_radio]:checked").val()); var zoneObj = $thisPopup.find("#wizard_zone option:selected").data("zoneObj"); - if (zoneObj.networktype == "Advanced") { - var $selectedPrimaryNetworks = $thisPopup.find("input:radio[name=primary_network]:checked"); + if (zoneObj.networktype == "Advanced") { + var $selectedPrimaryNetworks; + if($thisPopup.find("#network_virtual_container").css("display") == "none") + $selectedPrimaryNetworks = $thisPopup.find("#network_direct_container").find("input:radio[name=primary_network]:checked"); + else + $selectedPrimaryNetworks = $thisPopup.find("input:radio[name=primary_network]:checked"); + var networkIds = $selectedPrimaryNetworks.data("jsonObj").id; var directNetworkIds = $thisPopup.find("#wizard_review_secondary_network_container").data("directNetworkIds");