[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2382] email address is not being displayed in contarc and messages

[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 14ff0a9  [OPENMEETINGS-2382] email address is not being displayed in 
contarc and messages
14ff0a9 is described below

commit 14ff0a9b56bc541a7d6216bed4fade283fe73864
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Jun 6 11:34:52 2020 +0700

    [OPENMEETINGS-2382] email address is not being displayed in contarc and 
messages
---
 .../web/user/profile/MessagesContactsPanel.java           | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index 7eea2ce..9fa2f03 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -550,14 +550,14 @@ public class MessagesContactsPanel extends UserBasePanel {
                target.add(buttons);
        }
 
-       private static String getEmail(User u) {
-               return u == null || u.getAddress() == null ? "" : 
u.getAddress().getEmail();
+       private static String getDisplayName(User u) {
+               return u == null ? "" : u.getDisplayName();
        }
 
        private void selectMessage(long id, AjaxRequestTarget target) {
                PrivateMessage msg = getBean(PrivateMessageDao.class).get(id);
-               selectedMessage.addOrReplace(new Label("from", msg == null ? "" 
: getEmail(msg.getFrom())));
-               selectedMessage.addOrReplace(new Label("to", msg == null ? "" : 
getEmail(msg.getTo())));
+               selectedMessage.addOrReplace(new Label("from", msg == null ? "" 
: getDisplayName(msg.getFrom())));
+               selectedMessage.addOrReplace(new Label("to", msg == null ? "" : 
getDisplayName(msg.getTo())));
                selectedMessage.addOrReplace(new Label("subj", msg == null ? "" 
: msg.getSubject()));
                selectedMessage.addOrReplace(new Label("body", msg == null ? "" 
: msg.getMessage()).setEscapeModelStrings(false));
                if (msg == null) {
@@ -614,13 +614,6 @@ public class MessagesContactsPanel extends UserBasePanel {
                }
        }
 
-       private static String getDisplayName(User u) {
-               return new StringBuilder().append(u.getFirstname()).append(" ")
-                               .append(u.getLastname()).append(" ")
-                               .append("<").append(getEmail(u)).append(">")
-                               .toString();
-       }
-
        private void updateMoveModel() {
                List<PrivateMessageFolder> list = new ArrayList<>();
                list.add(NOT_MOVE_FOLDER);