Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: check for shape before shape.isLocked #16525

Merged
merged 4 commits into from
Jan 24, 2023
Merged

fix: check for shape before shape.isLocked #16525

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bd8ff69
fix: check for shape before shape.isLocked
antobinary Jan 20, 2023
b88cd77
Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/big…
germanocaumo Jan 24, 2023
44692f9
refactor(whiteboard): move shapelock to container + linting
germanocaumo Jan 24, 2023
0a45316
Merge pull request #12 from germanocaumo/wb-locked-refactor
antobinary Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ export default function Whiteboard(props) {
}
// set shapes as locked for those who aren't allowed to edit it
Object.entries(shapes).forEach(([shapeId, shape]) => {
if (!shape.isLocked && !hasShapeAccess(shapeId)) {
if (shape &&!shape.isLocked && !hasShapeAccess(shapeId)) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (shape &&!shape.isLocked && !hasShapeAccess(shapeId)) {
if (shape && !shape.isLocked && !hasShapeAccess(shapeId)) {

shape.isLocked = true;
}
});
Expand Down