From 7cf46b5946a4bb09495d4c060b045bf9813e954f Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 2 Feb 2011 13:30:43 -0800 Subject: [PATCH] bug 8244: IP Address page - all dialogs - hide info_container when clicking Submit button. --- ui/scripts/cloud.core.ipaddress.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js index 9eb0b8b6e51..3df41be6701 100644 --- a/ui/scripts/cloud.core.ipaddress.js +++ b/ui/scripts/cloud.core.ipaddress.js @@ -680,10 +680,13 @@ function showEnableVPNDialog($thisTab) { $("#dialog_enable_vpn") .dialog('option', 'buttons', { "Enable": function() { + var $thisDialog = $(this); + $thisDialog.find("#info_container").hide(); + $spinningWheel = $thisDialog.find("#spinning_wheel").show(); + var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1"); var ipObj = $midmenuItem1.data("jsonObj"); - var $thisDialog = $(this); - $spinningWheel = $thisDialog.find("#spinning_wheel").show(); + $.ajax({ data: createURL("command=createRemoteAccessVpn&publicipid="+ipObj.id+"&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid), dataType: "json", @@ -805,6 +808,7 @@ function showVpnUsers(presharedkey, publicip) { .dialog('option', 'buttons', { "Disable": function() { var $thisDialog = $(this); + $thisDialog.find("#info_container").hide(); $spinningWheel = $thisDialog.find("#spinning_wheel").show(); $.ajax({ data: createURL("command=deleteRemoteAccessVpn&publicipid="+ipObj.id+"&account="+ipObj.account+"&domainid="+ipObj.domainid+"&zoneid="+ipObj.zoneid), @@ -879,6 +883,7 @@ function showVpnUsers(presharedkey, publicip) { "Add": function() { var $thisDialog = $(this); $thisDialog.find("#info_container").hide(); + var isValid = true; isValid &= validateString("Username", $thisDialog.find("#username"), $thisDialog.find("#username_errormsg")); isValid &= validateString("Password", $thisDialog.find("#password"), $thisDialog.find("#password_errormsg")); @@ -994,6 +999,7 @@ function enableDeleteUser() { $thisDialog.find("#username").text(target.data("username")); $thisDialog.dialog('option', 'buttons', { "Ok": function() { + $thisDialog.find("#info_container").hide(); $spinningWheel = $thisDialog.find("#spinning_wheel").show(); $.ajax({ data: createURL("command=removeVpnUser"+params.join("")),