From 3cbf985f0fa0c66c794841a42fe8d7cede595bbe Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 17 Feb 2011 15:35:19 -0800 Subject: [PATCH] bug 8635: 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 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index dde7baec1fd..15fb6da9816 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1023,7 +1023,12 @@ function initVMWizard() { var zoneObj = $thisPopup.find("#wizard_zone option:selected").data("zoneObj"); if (zoneObj.networktype == "Advanced") { var $selectedSecondaryNetworks = $thisPopup.find("input:checkbox[name=secondary_network]:checked"); - var $selectedPrimaryNetworks = $thisPopup.find("input:radio[name=primary_network]:checked"); + + 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"); // prevent a person from moving on if no network has been selected if($selectedPrimaryNetworks.length == 0) {