You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/03/07 15:09:18 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2030]
displayName is being used in activities and video dialog title
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 02389df [OPENMEETINGS-2030] displayName is being used in activities and video dialog title
02389df is described below
commit 02389df1963b9f9bf36afeb0fb566cdd3111be33
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Mar 7 22:09:05 2019 +0700
[OPENMEETINGS-2030] displayName is being used in activities and video dialog title
---
.../main/java/org/apache/openmeetings/db/entity/basic/Client.java | 1 +
.../main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java | 6 +++---
.../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 7 ++-----
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
index 718966b..129f836 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Client.java
@@ -338,6 +338,7 @@ public class Client implements IDataProviderEntity, IWsClient {
u.put("id", user.getId())
.put("firstName", user.getFirstname())
.put("lastName", user.getLastname())
+ .put("displayName", user.getDisplayName())
.put("address", a)
.put("pictureUri", pictureUri);
if (user.getAddress() != null) {
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java
index 1762dd8..4c25eee 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ws/RoomMessage.java
@@ -67,16 +67,16 @@ public class RoomMessage implements IWebSocketPushMessage {
}
public RoomMessage(Long roomId, User u, Type type) {
- this(roomId, u.getId(), u.getFirstname(), u.getLastname(), type);
+ this(roomId, u.getId(), u.getDisplayName(), type);
}
- private RoomMessage(Long roomId, Long userId, String firstName, String lastName, Type type) {
+ private RoomMessage(Long roomId, Long userId, String displayName, Type type) {
this.timestamp = new Date();
this.roomId = roomId;
if (SIP_USER_ID.equals(userId)) {
this.name = SIP_FIRST_NAME;
} else {
- name = String.format("%s %s", firstName, lastName);
+ name = displayName;
}
this.userId = userId;
this.type = type;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index e16fd49..0e070d5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -5,9 +5,6 @@ var Video = (function() {
, lastVolume = 50, muted = false, aCtx, aSrc, aDest, gainNode
, lm, level, userSpeaks = false;
- function _getName() {
- return sd.user.firstName + ' ' + sd.user.lastName;
- }
function _getExtra() {
return t.height() + 2 + (f.is(':visible') ? f.height() : 0);
}
@@ -345,7 +342,7 @@ var Video = (function() {
sd.activities = sd.activities.sort();
size = {width: sd.width, height: sd.height};
const _id = VideoUtil.getVid(sd.uid)
- , name = _getName()
+ , name = sd.user.displayName
, _w = sd.width
, _h = sd.height
, isSharing = VideoUtil.isSharing(sd)
@@ -395,7 +392,7 @@ var Video = (function() {
sd.activities = _c.activities.sort();
sd.user.firstName = _c.user.firstName;
sd.user.lastName = _c.user.lastName;
- const name = _getName();
+ const name = sd.user.displayName;
v.dialog('option', 'title', name).parent().find('.ui-dialog-titlebar').attr('title', name);
const same = prevA.length === sd.activities.length && prevA.every(function(value, index) { return value === sd.activities[index]})
if (sd.self && !same) {