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

Revert "Fix: Breakouts calculation for valid users incorrect"

Browse Source 
This reverts commit a86bdc9f1e.
This commit is contained in:
André Möller 2024-07-10 10:21:12 -03:00
parent a86bdc9f1e
commit ce8bb567a0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bigbluebutton-html5/imports/ui/components/actions-bar/create-breakout-room/component.jsx
View File

@ -469,7 +469,7 @@ class BreakoutRoom extends PureComponent {
return; return;
} }
if (users.length === this.getUserByRoom(0).length) { if (users.length === this.getUserByRoom(0).length && !freeJoin) {
this.setState({ leastOneUserIsValid: false }); this.setState({ leastOneUserIsValid: false });
return; return;
} }
@ -510,9 +510,9 @@ class BreakoutRoom extends PureComponent {
onInviteBreakout() { onInviteBreakout() {
const { getBreakouts, sendInvitation } = this.props; const { getBreakouts, sendInvitation } = this.props;
const { users } = this.state; const { users, freeJoin } = this.state;
const breakouts = getBreakouts(); const breakouts = getBreakouts();
if (users.length === this.getUserByRoom(0).length) { if (users.length === this.getUserByRoom(0).length && !freeJoin) {
this.setState({ leastOneUserIsValid: false }); this.setState({ leastOneUserIsValid: false });
return; return;
} }
@ -637,7 +637,7 @@ class BreakoutRoom extends PureComponent {
} }
setFreeJoin(e) { setFreeJoin(e) {
this.setState({ freeJoin: e.target.checked }); this.setState({ freeJoin: e.target.checked, leastOneUserIsValid: true });
} }
setRecord(e) { setRecord(e) {
@ -724,7 +724,7 @@ class BreakoutRoom extends PureComponent {
this.setState({ this.setState({
users: usersCopy, users: usersCopy,
leastOneUserIsValid: (this.getUserByRoom(0).length !== users.length), leastOneUserIsValid: (this.getUserByRoom(0).length !== users.length || freeJoin),
}, () => { }, () => {
addNewAlert(intl.formatMessage(intlMessages.movedUserLabel, { 0: userName, 1: room })) addNewAlert(intl.formatMessage(intlMessages.movedUserLabel, { 0: userName, 1: room }))
}); });
@ -1149,8 +1149,6 @@ class BreakoutRoom extends PureComponent {
leastOneUserIsValid, leastOneUserIsValid,
} = this.state; } = this.state;
console.log('leastOneUserIsValid', leastOneUserIsValid);
return ( return (
<Styled.AssignBtnsContainer> <Styled.AssignBtnsContainer>
<Styled.LabelText bold aria-hidden> <Styled.LabelText bold aria-hidden>