[openmeetings] branch master updated: [OPENMEETINGS-1952] registration error should be displayed

[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 d81de6c  [OPENMEETINGS-1952] registration error should be displayed
d81de6c is described below

commit d81de6cee21b14c9718482d977427606b9a75be8
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Oct 9 14:15:43 2018 +0700

    [OPENMEETINGS-1952] registration error should be displayed
---
 .../java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index 9ed3e00..ae2c76d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -190,8 +190,11 @@ public class RegisterDialog extends 
NonClosableDialog<String> {
        @Override
        protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
                try {
-                       userManager.registerUser(login, password, lastName
+                       Object o = userManager.registerUser(login, password, 
lastName
                                        , firstName, email, country, lang, 
tzModel.getObject());
+                       if (o instanceof String) {
+                               
confirmRegistration.setModelObject(getString((String)o));
+                       }
                } catch (Exception e) {
                        log.error("[registerUser]", e);
                }