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/10/22 16:35:40 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2127] recording
user wasn't displayed if user has no first/last name
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 ef685e0 [OPENMEETINGS-2127] recording user wasn't displayed if user has no first/last name
ef685e0 is described below
commit ef685e03b712b699ec4ec00143658cbf58c353e0
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Tue Oct 22 23:35:26 2019 +0700
[OPENMEETINGS-2127] recording user wasn't displayed if user has no first/last name
---
.../org/apache/openmeetings/web/room/menu/RoomMenuPanel.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 3083cb7..37c4bc4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -210,12 +210,18 @@ public class RoomMenuPanel extends Panel {
pollsSubMenu.update(moder, notExternalUser, r);
menuPanel.update(handler);
StringBuilder roomClass = new StringBuilder("room name");
- StringBuilder roomTitle = new StringBuilder();
+ String roomTitle = "";
if (streamProcessor.isRecording(r.getId())) {
JSONObject ru = kHandler.getRecordingUser(r.getId());
if (!Strings.isEmpty(ru.optString("login"))) {
- roomTitle.append(String.format("%s %s %s %s %s", getString("419")
- , ru.getString("login"), ru.getString("firstName"), ru.getString("lastName"), df.format(new Date(ru.getLong("started")))));
+ roomTitle += getString("419") + " " + ru.getString("login");
+ if (!Strings.isEmpty(ru.optString("firstName"))) {
+ roomTitle += " " + ru.getString("firstName");
+ }
+ if (!Strings.isEmpty(ru.optString("lastName"))) {
+ roomTitle += " " + ru.getString("lastName");
+ }
+ roomTitle += " " + df.format(new Date(ru.getLong("started")));
roomClass.append(" screen");
}
}