[openmeetings] branch master updated: [OPENMEETINGS-2383] displayName is used in chat

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

commit ff5f85933fdb5d5329f47f42020da2e592c4f87b
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sat Jun 6 11:21:44 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 94463a3..c4a048a 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
@@ -303,7 +303,7 @@ var Chat = function() {
                                area.mouseleave(function() {
                                        __hideActions();
                                });
-                               msg.find('.from').data('user-id', 
cm.from.id).html(cm.from.name || cm.from.displayName);
+                               msg.find('.from').data('user-id', 
cm.from.id).html(cm.from.displayName || cm.from.name);
                                msg.find('.time').html(cm.time).attr('title', 
cm.sent);
                                if (!area.length) {
                                        _addTab(cm.scope, cm.scopeName);