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

Merge pull request #11581 from ramonlsouza/issue-11145

Browse Source 
Fixes incorrectly displaying of 'restore presentation' button when presentation is disabled
This commit is contained in:
Anton Georgiev 2021-03-08 09:37:29 -05:00 committed by GitHub
commit cc22f8c042
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
View File

@ -30,6 +30,7 @@ class ActionsBar extends PureComponent {
isCaptionsAvailable,
isMeteorConnected,
isPollingEnabled,
isPresentationDisabled,
isThereCurrentPresentation,
allowExternalVideo,
} = this.props;
@ -87,7 +88,7 @@ class ActionsBar extends PureComponent {
/>
</div>
<div className={styles.right}>
{isLayoutSwapped
{isLayoutSwapped && !isPresentationDisabled
? (
<PresentationOptionsContainer
toggleSwapLayout={toggleSwapLayout}

2
bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
View File

@ -25,6 +25,7 @@ import MediaService, {
const ActionsBarContainer = props => <ActionsBar {...props} />;
const POLLING_ENABLED = Meteor.settings.public.poll.enabled;
const PRESENTATION_DISABLED = Meteor.settings.public.layout.hidePresentation;
export default withTracker(() => ({
amIPresenter: Service.amIPresenter(),
@ -46,6 +47,7 @@ export default withTracker(() => ({
isCaptionsAvailable: CaptionsService.isCaptionsAvailable(),
isMeteorConnected: Meteor.status().connected,
isPollingEnabled: POLLING_ENABLED,
isPresentationDisabled: PRESENTATION_DISABLED,
isThereCurrentPresentation: Presentations.findOne({ meetingId: Auth.meetingID, current: true },
{ fields: {} }),
allowExternalVideo: Meteor.settings.public.externalVideoPlayer.enabled,