[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2286] user email is not displayed by default

[solomax]

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

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


The following commit(s) were added to refs/heads/4.0.x by this push:
     new 3a30d29  [OPENMEETINGS-2286] user email is not displayed by default
3a30d29 is described below

commit 3a30d29616971d919c19ebd581fe4f76e4031a54
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat May 30 11:11:05 2020 +0700

    [OPENMEETINGS-2286] user email is not displayed by default
---
 .../main/java/org/apache/openmeetings/db/util/FormatHelper.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
index 59b58fd..1ee59fc 100644
--- 
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
+++ 
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
@@ -26,7 +26,6 @@ import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.openmeetings.db.entity.user.User;
-import org.apache.wicket.util.string.Strings;
 
 public class FormatHelper {
        /**
@@ -76,11 +75,10 @@ public class FormatHelper {
        public static String formatUser(User u, boolean isHTMLEscape) {
                String user = "";
                if (u != null) {
-                       String email = u.getAddress() == null ? "" : 
u.getAddress().getEmail();
-                       if (Strings.isEmpty(u.getFirstname()) && 
Strings.isEmpty(u.getLastname())) {
-                               user = email;
+                       if (User.Type.contact == u.getType() && u.getAddress() 
!= null) {
+                               user = String.format("\"%s\" <%s>", 
u.getDisplayName(), u.getAddress().getEmail());
                        } else {
-                               user = String.format("\"%s %s\" <%s>", 
u.getFirstname(), u.getLastname(), email);
+                               user = String.format("\"%s\" [%s]", 
u.getDisplayName(), u.getLogin());
                        }
                        user = isHTMLEscape ? escapeHtml4(user) : user;
                }