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 2021/01/27 09:43:18 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2563] empty tabs are hidden from private rooms panel

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 5b0921a  [OPENMEETINGS-2563] empty tabs are hidden from private rooms panel
5b0921a is described below

commit 5b0921a992ac696824214922bcb0816061d7dae7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Jan 27 16:42:59 2021 +0700

    [OPENMEETINGS-2563] empty tabs are hidden from private rooms panel
---
 .../org/apache/openmeetings/db/dao/basic/ConfigurationDao.java |  3 +--
 .../apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java   | 10 ++++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 257ce13..3bcc3a8 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -47,7 +47,6 @@ import org.apache.openmeetings.db.dao.server.OAuth2Dao;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.basic.Configuration;
 import org.apache.openmeetings.db.util.DaoHelper;
-import org.apache.openmeetings.util.OpenmeetingsVariables;
 import org.apache.openmeetings.util.crypt.CryptProvider;
 import org.apache.wicket.Application;
 import org.apache.wicket.csp.CSPDirective;
@@ -491,7 +490,7 @@ public class ConfigurationDao implements IDataProviderDao<Configuration> {
 	}
 
 	private void reloadRecordingEnabled() {
-		OpenmeetingsVariables.setRecordingsEnabled(getBool(CONFIG_RECORDING_ENABLED, true));
+		setRecordingsEnabled(getBool(CONFIG_RECORDING_ENABLED, true));
 	}
 
 	public void reinit() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
index bf84df6..e14abd8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
@@ -21,9 +21,12 @@ package org.apache.openmeetings.web.user.rooms;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
 
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.Group;
+import org.apache.openmeetings.db.entity.user.GroupUser;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.web.common.UserPanel;
 import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
@@ -49,12 +52,15 @@ public class RoomsTabbedPanel extends UserPanel {
 	protected void onInitialize() {
 		super.onInitialize();
 		User u = userDao.get(getUserId());
-		add(new AjaxBootstrapTabbedPanel<>("orgTabs", u.getGroupUsers().stream().map(gu -> new AbstractTab(Model.of(gu.getGroup().getName())) {
+		Stream<Group> groups = u.getGroupUsers().stream()
+				.map(GroupUser::getGroup)
+				.filter(g -> !roomDao.getGroupRooms(g.getId()).isEmpty());
+		add(new AjaxBootstrapTabbedPanel<>("orgTabs", groups.map(g -> new AbstractTab(Model.of(g.getName())) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
 			public WebMarkupContainer getPanel(String panelId) {
-				return new RoomsPanel(panelId, roomDao.getGroupRooms(gu.getGroup().getId()));
+				return new RoomsPanel(panelId, roomDao.getGroupRooms(g.getId()));
 			}
 		}).collect(Collectors.toList())));
 	}