[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2383] displayName is used in chat

[so...@apache.org]

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 934b524  [OPENMEETINGS-2383] displayName is used in chat
934b524 is described below

commit 934b5242f1f2045e3c343b279d5c6959a487e50f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Jun 6 11:41:38 2020 +0700

    [OPENMEETINGS-2383] displayName is used in chat
---
 .../src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index ca9857f..6d7b445 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -241,7 +241,7 @@ var Chat = function() {
 				area.mouseleave(function() {
 					__hideActions();
 				});
-				msg.find('.from').addClass(align).data('user-id', cm.from.id).html(cm.from.name || cm.from.displayName);
+				msg.find('.from').addClass(align).data('user-id', cm.from.id).html(cm.from.displayName || cm.from.name);
 				msg.find('.time').addClass(alignIco).html(cm.time).attr('title', cm.sent);
 				if (!area.length) {
 					_addTab(cm.scope, cm.scopeName);