[openmeetings] branch master updated: [OPENMEETINGS-2295] restore will fail if email/login exists

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new 890ef33  [OPENMEETINGS-2295] restore will fail if email/login exists
890ef33 is described below

commit 890ef338d25a7f0d547ac90912da3029d28de88f
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Jun 6 22:27:11 2020 +0700

    [OPENMEETINGS-2295] restore will fail if email/login exists
---
 .../main/java/org/apache/openmeetings/web/common/GeneralUserForm.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index ca8153a..394354d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -161,7 +161,7 @@ public class GeneralUserForm extends Form<User> {
        @Override
        protected void onValidate() {
                User u = getModelObject();
-               if(!userDao.checkEmail(email.getConvertedInput(), u.getType(), 
u.getDomainId(), u.getId())) {
+               if (!userDao.checkEmail(email.getConvertedInput(), u.getType(), 
u.getDomainId(), u.getId())) {
                        error(getString("error.email.inuse"));
                }
                super.onValidate();