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 2017/11/06 11:10:17 UTC
openmeetings git commit: no jira: chat init is refactored
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x acc73889a -> e326cffdf
no jira: chat init is refactored
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e326cffd
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e326cffd
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e326cffd
Branch: refs/heads/4.0.x
Commit: e326cffdf46fa004082b0f7ac218759f9673965f
Parents: acc7388
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Nov 6 18:10:06 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Nov 6 18:10:06 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/user/chat/Chat.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e326cffd/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index a0d8f8b..380ae41 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -37,7 +37,6 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import java.time.Duration;
import java.time.Instant;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -164,13 +163,12 @@ public class Chat extends Panel {
if (showDashboardChat) {
ChatDao dao = getBean(ChatDao.class);
//TODO limited count should be loaded with "earlier" link
- List<ChatMessage> list = new ArrayList<>(dao.getGlobal(0, 30));
+ StringBuilder sb = new StringBuilder(getReinit());
for(Long roomId : getUserRooms(getUserId())) {
Room r = getBean(RoomDao.class).get(roomId);
- list.addAll(dao.getRoom(roomId, 0, 30, !r.isChatModerated() || isModerator(getUserId(), roomId)));
+ sb.append(addRoom(r));
}
- list.addAll(dao.getUserRecent(getUserId(), Date.from(Instant.now().minus(Duration.ofHours(1L))), 0, 30));
- StringBuilder sb = new StringBuilder(getReinit());
+ List<ChatMessage> list = dao.getUserRecent(getUserId(), Date.from(Instant.now().minus(Duration.ofHours(1L))), 0, 30);
if (!list.isEmpty()) {
sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");");
}