From ea3926e8ef3b43931724616935dac1dd6db5ec95 Mon Sep 17 00:00:00 2001
From: Martin Beckmann <m.beckmann@konkret-mafo.cloud>
Date: Sat, 23 May 2020 22:28:56 +0200
Subject: [PATCH] attempt to introduce an additional UserSettings parameter
'bbb_show_public_chat_on_login' as a co-parameter of
'bbb_show_participants_on_login' (the former intended to only have an effect
if the latter is 'true')
---
.../api/users-settings/server/methods/addUserSettings.js | 1 +
bigbluebutton-html5/imports/startup/client/base.jsx | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
index ca1f20e2e0..b0c11aebbb 100644
--- a/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
+++ b/bigbluebutton-html5/imports/api/users-settings/server/methods/addUserSettings.js
@@ -59,6 +59,7 @@ const currentParameters = [
'bbb_auto_swap_layout',
'bbb_hide_presentation',
'bbb_show_participants_on_login',
+ 'bbb_show_public_chat_on_login',
// OUTSIDE COMMANDS
'bbb_outside_toggle_self_voice',
'bbb_outside_toggle_recording',
diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index 48bcc57099..4a4bf7a75e 100755
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -356,9 +356,9 @@ const BaseContainer = withTracker(() => {
if (getFromUserSettings('bbb_show_participants_on_login', true) && !deviceInfo.type().isPhone) {
Session.set('openPanel', 'userlist');
- if (CHAT_ENABLED) {
- //Session.set('openPanel', 'chat');
- //Session.set('idChatOpen', PUBLIC_CHAT_ID);
+ if (CHAT_ENABLED && getFromUserSettings('bbb_show_public_chat_on_login', true)) {
+ Session.set('openPanel', 'chat');
+ Session.set('idChatOpen', PUBLIC_CHAT_ID);
}
} else {
Session.set('openPanel', '');
--
GitLab