From ff828e5bfbc7906064a42e528965b83f022441ed Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 19 Jul 2011 16:40:53 -0700 Subject: [PATCH] bug 10024: CloudStack UI - fix a bug that adding a pod from the resource page page didn't work. --- ui/scripts/cloud.core.resource.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index f0065ff560c..155cc9fca56 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -484,10 +484,14 @@ function initAddPodShortcut() { isValid &= validateIp("Start IP Range", $thisDialog.find("#add_pod_startip"), $thisDialog.find("#add_pod_startip_errormsg")); //required isValid &= validateIp("End IP Range", $thisDialog.find("#add_pod_endip"), $thisDialog.find("#add_pod_endip_errormsg"), true); //optional isValid &= validateIp("Gateway", $thisDialog.find("#add_pod_gateway"), $thisDialog.find("#add_pod_gateway_errormsg")); //required when creating - - if($thisDialog.find("#guestip_container").css("display") != "none") - isValid &= addZoneWizardValidateDirectVLAN($thisDialog); - + + if($thisDialog.find("#guestip_container").css("display") != "none") { + isValid &= validateIp("Guest IP Range", $thisDialog.find("#startguestip"), $thisDialog.find("#startguestip_errormsg")); //required + isValid &= validateIp("Guest IP Range", $thisDialog.find("#endguestip"), $thisDialog.find("#endguestip_errormsg"), true); //optional + isValid &= validateIp("Guest Netmask", $thisDialog.find("#guestnetmask"), $thisDialog.find("#guestnetmask_errormsg")); //required when creating + isValid &= validateIp("Guest Gateway", $thisDialog.find("#guestgateway"), $thisDialog.find("#guestgateway_errormsg")); + } + if (!isValid) return;