diff --git a/DnsServerCore/www/js/common.js b/DnsServerCore/www/js/common.js index e11639f5..827ef3c0 100644 --- a/DnsServerCore/www/js/common.js +++ b/DnsServerCore/www/js/common.js @@ -99,17 +99,19 @@ function HTTPRequest(url, data, success, error, invalidToken, objAlertPlaceholde break; case "error": + showAlert("danger", "Error!", responseJson.errorMessage, objAlertPlaceholder); + if (error != null) error(); - showAlert("danger", "Error!", responseJson.errorMessage, objAlertPlaceholder); break; default: + showAlert("danger", "Invalid Response!", "Server returned invalid response status: " + responseJson.status, objAlertPlaceholder); + if (error != null) error(); - showAlert("danger", "Invalid Response!", "Server returned invalid response status: " + responseJson.status, objAlertPlaceholder); break; } diff --git a/DnsServerCore/www/js/main.js b/DnsServerCore/www/js/main.js index b11e3a3e..94b637a1 100644 --- a/DnsServerCore/www/js/main.js +++ b/DnsServerCore/www/js/main.js @@ -64,12 +64,20 @@ $(function () { }); showPageLogin(); + login("admin", "admin"); }); -function login() { +function login(username, password) { - var username = $("#txtUser").val(); - var password = $("#txtPass").val(); + var autoLogin = false; + + if (username == null) { + username = $("#txtUser").val(); + password = $("#txtPass").val(); + } + else { + autoLogin = true; + } if ((username === null) || (username === "")) { showAlert("warning", "Missing!", "Please enter username."); @@ -92,6 +100,9 @@ function login() { }, error: function () { btn.button('reset'); + + if (autoLogin) + hideAlert(); } });