From 3fb5d1c7cd852b52cecd1ef763872bea78e1ba91 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Wed, 3 Jan 2018 11:20:46 +0000 Subject: [PATCH] Bug 19907: Fix email validation in patron edit form Test plan: 0) Confirm that email validation is not working in add/edit patron form 1) Apply the patch 2) Edit/add patron, the e-mail validation should be working now 3) Ensure the password validation is still working (use test plan from bug 19908) Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt --- .../prog/en/modules/members/memberentrygen.tt | 12 ------------ koha-tmpl/intranet-tmpl/prog/js/members.js | 7 +++++++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 55c02e1834..7d03ab0f3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -94,18 +94,6 @@ $(document).ready(function() { else {return false;} }); - $("#entryform").validate({ - rules: { - password: { - password_strong: true, - password_no_spaces: true - }, - password2: { - password_match: true - } - } - }); - $("#saverecord").click(function(){ if( check_form_borrowers() ){ $("#entryform").submit(); diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js index aea1f6808e..e586e60d23 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/members.js +++ b/koha-tmpl/intranet-tmpl/prog/js/members.js @@ -319,6 +319,13 @@ $(document).ready(function(){ }, B_email: { email: true + }, + password: { + password_strong: true, + password_no_spaces: true + }, + password2: { + password_match: true } }, submitHandler: function(form) { -- 2.39.5