[openmeetings] branch 4.0.x updated: [OPENMEETINGS-2144] grouping by presenter is added

[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 22b7eb6  [OPENMEETINGS-2144] grouping by presenter is added
22b7eb6 is described below

commit 22b7eb69b476822d0040cd67d7c13a522301211c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Dec 5 18:25:30 2019 +0700

    [OPENMEETINGS-2144] grouping by presenter is added
---
 .../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 2ac905c..3817cc3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -106,8 +106,15 @@ public class RoomSidebar extends Panel {
 				list = Arrays.asList(self);
 			} else {
 				list = getBean(ClientManager.class).listByRoom(room.getRoom().getId());
-				list.sort(Comparator.<Client, Boolean>comparing(c -> c.hasRight(Room.Right.moderator), naturalOrder())
-						.reversed()
+				list.sort(Comparator.<Client, Integer>comparing(c -> {
+							if (c.hasRight(Room.Right.moderator)) {
+								return 0;
+							}
+							if (c.hasRight(Room.Right.presenter)) {
+								return 1;
+							}
+							return 5;
+						}, naturalOrder())
 						.thenComparing(c -> c.getUser().getDisplayName(), String::compareToIgnoreCase));
 			}
 			userCount.setDefaultModelObject(list.size());