From 3da374326bd6b6109cf7c40b94f43f1a46230368 Mon Sep 17 00:00:00 2001 From: "Artem.Arefev" Date: Fri, 17 May 2019 14:16:41 +0400 Subject: [PATCH] 88 replacing all alerts in users.js --- src/main/resources/public/js/users.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/public/js/users.js b/src/main/resources/public/js/users.js index 3f4af95..76bd41d 100644 --- a/src/main/resources/public/js/users.js +++ b/src/main/resources/public/js/users.js @@ -4,12 +4,12 @@ function changePassword() { confirmPassword = document.getElementById("confirmPassword").value if ([oldPassword.length, password.length, confirmPassword.length].includes(0)) { - alert("Заполните все поля"); + showFeedbackMessage("Заполните все поля", MessageTypesEnum.WARNING); return; } if (password != confirmPassword) { - alert("Повторный пароль введен неверно"); + showFeedbackMessage("Повторный пароль введен неверно", MessageTypesEnum.WARNING); return; } @@ -17,9 +17,9 @@ function changePassword() { url:"/api/1.0/users/changePassword", contentType: "application/json; charset=utf-8", data: JSON.stringify({ - "oldPassword": document.getElementById("oldPassword").value, - "password": document.getElementById("password").value, - "confirmPassword": document.getElementById("confirmPassword").value, + "oldPassword": oldPassword, + "password": password, + "confirmPassword": confirmPassword, }), method: "POST", success: function() { @@ -39,7 +39,7 @@ function inviteUser() { if (!re.test(email)) { - alert("Некорректный почтовый ящик") + showFeedbackMessage("Некорректный почтовый ящик", MessageTypesEnum.WARNING); return; }