BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10870 from antobinary/breakouts-who-is-talking-mute

Browse Source 
Breakouts: do not allow mute via who-is-talking button
This commit is contained in:
Anton Georgiev 2020-11-19 14:20:12 -05:00 committed by GitHub
commit a310a59257
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-config/bigbluebutton-release
View File

@ -1 +1,2 @@
BIGBLUEBUTTON_RELEASE=2.2.29 BIGBLUEBUTTON_RELEASE=2.2.30

5
bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/component.jsx
View File

@ -22,8 +22,9 @@ const intlMessages = defineMessages({
class TalkingIndicator extends PureComponent { class TalkingIndicator extends PureComponent {
handleMuteUser(id) { handleMuteUser(id) {
const { muteUser, amIModerator } = this.props; const { muteUser, amIModerator, isBreakoutRoom } = this.props;
if (!amIModerator) return; // only allow moderator muting anyone in non-breakout
if (!amIModerator || isBreakoutRoom) return;
muteUser(id); muteUser(id);
} }

2
bigbluebutton-html5/imports/ui/components/nav-bar/talking-indicator/container.jsx
View File

@ -6,6 +6,7 @@ import Auth from '/imports/ui/services/auth';
import { debounce } from 'lodash'; import { debounce } from 'lodash';
import TalkingIndicator from './component'; import TalkingIndicator from './component';
import { makeCall } from '/imports/ui/services/api'; import { makeCall } from '/imports/ui/services/api';
import { meetingIsBreakout } from '/imports/ui/components/app/service';
import Service from './service'; import Service from './service';
const APP_CONFIG = Meteor.settings.public.app; const APP_CONFIG = Meteor.settings.public.app;
@ -65,5 +66,6 @@ export default withTracker(() => {
talkers, talkers,
muteUser: id => debounce(muteUser(id), 500, { leading: true, trailing: false }), muteUser: id => debounce(muteUser(id), 500, { leading: true, trailing: false }),
openPanel: Session.get('openPanel'), openPanel: Session.get('openPanel'),
isBreakoutRoom: meetingIsBreakout(),
}; };
})(TalkingIndicatorContainer); })(TalkingIndicatorContainer);