From b88c349e945f4fd388a80876129fa4a35b19c418 Mon Sep 17 00:00:00 2001
From: Santiago Revilla <spr@jpos.org>
Date: Mon, 2 Sep 2019 17:13:13 -0300
Subject: [PATCH] Fields named email have emailValidator

---
 .../src/main/java/org/jpos/qi/util/FieldFactory.java     | 9 +++++++++
 .../src/main/java/org/jpos/qi/eeuser/UsersView.java      | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/qi-core/src/main/java/org/jpos/qi/util/FieldFactory.java b/modules/qi-core/src/main/java/org/jpos/qi/util/FieldFactory.java
index 69d1db7bcb..abc2285a2c 100644
--- a/modules/qi-core/src/main/java/org/jpos/qi/util/FieldFactory.java
+++ b/modules/qi-core/src/main/java/org/jpos/qi/util/FieldFactory.java
@@ -23,6 +23,7 @@
 import com.vaadin.data.Validator;
 import com.vaadin.data.converter.LocalDateToDateConverter;
 import com.vaadin.data.converter.StringToIntegerConverter;
+import com.vaadin.data.validator.EmailValidator;
 import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.data.validator.StringLengthValidator;
 import com.vaadin.ui.*;
@@ -192,6 +193,14 @@ public List<Validator> getValidators(String propertyId) {
                 validators.add(new RegexpValidator(getApp().getMessage("errorMessage.invalidField", getApp().getMessage(propertyId)),regex));
             if (length > 0)
                 validators.add(new StringLengthValidator(getApp().getMessage("errorMessage.invalidField", getApp().getMessage(propertyId)),0,length));
+            if ("email".equals(propertyId)) {
+                validators.add(new EmailValidator(getApp().getMessage("errorMessage.invalidEmail")) {
+                    @Override
+                    protected boolean isValid(String value) {
+                        return value == null || value.isEmpty() || super.isValid(value);
+                    }
+                });
+            }
         }
         return validators;
     }
diff --git a/modules/qi-eeuser/src/main/java/org/jpos/qi/eeuser/UsersView.java b/modules/qi-eeuser/src/main/java/org/jpos/qi/eeuser/UsersView.java
index 498650f89d..e138c3b868 100644
--- a/modules/qi-eeuser/src/main/java/org/jpos/qi/eeuser/UsersView.java
+++ b/modules/qi-eeuser/src/main/java/org/jpos/qi/eeuser/UsersView.java
@@ -154,14 +154,6 @@ public FieldFactory createFieldFactory() {
         return new FieldFactory(getBean(), getViewConfig(), getBinder()) {
             public List<Validator> getValidators(String propertyId) {
                 List<Validator> list = super.getValidators(propertyId);
-                if ("email".equals(propertyId)) {
-                    list.add(new EmailValidator(getApp().getMessage("errorMessage.invalidEmail")) {
-                        @Override
-                        protected boolean isValid(String value) {
-                            return value == null || value.isEmpty() || super.isValid(value);
-                        }
-                    });
-                }
                 if ("nick".equals(propertyId)) {
                     list.add(((UsersHelper)getHelper()).getNickTakenValidator());
                 }