[openmeetings] branch master updated: [OPENMEETINGS-2599] user is super moderator in own room, personal room is now moderated, romm comment is searchable

[so...@apache.org]

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 b0773b9  [OPENMEETINGS-2599] user is super moderator in own room, personal room is now moderated, romm comment is searchable
b0773b9 is described below

commit b0773b9ecb0b20141df41d6b02c81df1ced9640c
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Mar 24 19:55:13 2021 +0700

    [OPENMEETINGS-2599] user is super moderator in own room, personal room is now moderated, romm comment is searchable
---
 .../src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java     | 3 ++-
 .../src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java   | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index d90d83b..9231dac 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -60,7 +60,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional
 public class RoomDao implements IGroupAdminDataProviderDao<Room> {
 	private static final Logger log = LoggerFactory.getLogger(RoomDao.class);
-	private static final String[] searchFields = {"name"};
+	private static final String[] searchFields = {"name", "comment"};
 	public static final String GRP_MODERATORS = "roomModerators";
 	public static final String GRP_GROUPS = "roomGroups";
 	public static final String GRP_FILES = "roomFiles";
@@ -245,6 +245,7 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
 			room.setAllowUserQuestions(true);
 			room.setOwnerId(ownerId);
 			room.setAllowRecording(true);
+			room.setModerated(true);
 			room.hide(RoomElement.MICROPHONE_STATUS);
 
 			room = update(room, ownerId);
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
index 42acbb7..30b7536 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
@@ -52,6 +52,8 @@ public class AuthLevelUtil {
 		}
 		if (//admin user get superModerator level, no-one can kick him/her
 			hasAdminLevel(u.getRights())
+			// user personal room
+			|| u.getId().equals(r.getOwnerId())
 			// appointment owner is super moderator
 			|| (r.isAppointment() && a != null && u.getId().equals(a.getOwner().getId())))
 		{