From dedaea5ad2da26914456146deb17e8e96a621016 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Thu, 19 Nov 2020 14:12:05 -0500 Subject: [PATCH 1/2] who-is-talking - do not allow mute in breakouts --- .../ui/components/nav-bar/talking-indicator/component.jsx | 5 +++-- .../ui/components/nav-bar/talking-indicator/container.jsx | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/component.jsx index 35af787664..352ef2a11f 100644 --- a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/component.jsx @@ -22,8 +22,9 @@ const intlMessages = defineMessages({ class TalkingIndicator extends PureComponent { handleMuteUser(id) { - const { muteUser, amIModerator } = this.props; - if (!amIModerator) return; + const { muteUser, amIModerator, isBreakoutRoom } = this.props; + // only allow moderator muting anyone in non-breakout + if (!amIModerator || isBreakoutRoom) return; muteUser(id); } diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx index ae34cf629e..c97c2db99a 100644 --- a/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx @@ -6,6 +6,7 @@ import Auth from '/imports/ui/services/auth'; import { debounce } from 'lodash'; import TalkingIndicator from './component'; import { makeCall } from '/imports/ui/services/api'; +import { meetingIsBreakout } from '/imports/ui/components/app/service'; import Service from './service'; const APP_CONFIG = Meteor.settings.public.app; @@ -65,5 +66,6 @@ export default withTracker(() => { talkers, muteUser: id => debounce(muteUser(id), 500, { leading: true, trailing: false }), openPanel: Session.get('openPanel'), + isBreakoutRoom: meetingIsBreakout(), }; })(TalkingIndicatorContainer); From 35032963b9b33c64a8688e38710d952146d9197a Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Thu, 19 Nov 2020 14:15:45 -0500 Subject: [PATCH 2/2] bump up release to 2.2.30 --- bigbluebutton-config/bigbluebutton-release | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bigbluebutton-config/bigbluebutton-release b/bigbluebutton-config/bigbluebutton-release index a065531ce9..1240c5322f 100644 --- a/bigbluebutton-config/bigbluebutton-release +++ b/bigbluebutton-config/bigbluebutton-release @@ -1 +1,2 @@ -BIGBLUEBUTTON_RELEASE=2.2.29 +BIGBLUEBUTTON_RELEASE=2.2.30 +