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

prevent user item unlock affecting shared notes

Browse Source
This commit is contained in:
KDSBrowne 2020-05-12 21:21:56 +00:00
parent c28b0108ea
commit 26143e5889
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-html5/imports/ui/components/note/service.js
View File

@ -43,7 +43,7 @@ const isLocked = () => {
const meeting = Meetings.findOne({ meetingId: Auth.meetingID }, { fields: { 'lockSettingsProps.disableNote': 1 } });
const user = Users.findOne({ userId: Auth.userID }, { fields: { locked: 1, role: 1 } });
if (meeting.lockSettingsProps && user.locked && user.role !== ROLE_MODERATOR) {
if (meeting.lockSettingsProps && user.role !== ROLE_MODERATOR) {
return meeting.lockSettingsProps.disableNote;
}
return false;
@ -75,7 +75,7 @@ const isEnabled = () => {
const toggleNotePanel = () => {
Session.set(
'openPanel',
isPanelOpened() ? 'userlist' : 'note'
isPanelOpened() ? 'userlist' : 'note',
);
};

2
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/component.jsx
View File

@ -101,7 +101,7 @@ class UserNotes extends Component {
}
render() {
const { intl } = this.props;
const { intl, disableNote } = this.props;
if (!NoteService.isEnabled()) return null;