From e4cdd58b188e785a6d00cf3b7de0e9021d2489c6 Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
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 <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../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 a70a6457b4..4309824da9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1245,18 +1245,6 @@
                 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