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

Merge pull request #16783 from Scroody/I-16777

Browse Source 
fix: Propagate layout and layout setting don't show up when disabled features is enabled as a custom parameter.
This commit is contained in:
Ramón Souza 2023-02-22 16:20:26 -03:00 committed by GitHub
commit d8b5f944f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import BBBMenu from '/imports/ui/components/common/menu/component';
import Styled from './styles'; import Styled from './styles';
import { colorPrimary } from '/imports/ui/stylesheets/styled-components/palette'; import { colorPrimary } from '/imports/ui/stylesheets/styled-components/palette';
import { PANELS, ACTIONS, LAYOUT_TYPE } from '../../layout/enums'; import { PANELS, ACTIONS, LAYOUT_TYPE } from '../../layout/enums';
import {isLayoutsEnabled} from '/imports/ui/services/features';
const propTypes = { const propTypes = {
amIPresenter: PropTypes.bool.isRequired, amIPresenter: PropTypes.bool.isRequired,
@ -218,22 +219,25 @@ class ActionsDropdown extends PureComponent {
}) })
} }
if (amIPresenter && showPushLayout) { if (amIPresenter && showPushLayout && isLayoutsEnabled()) {
actions.push({ actions.push({
icon: 'send', icon: 'send',
label: intl.formatMessage(intlMessages.propagateLayoutLabel), label: intl.formatMessage(intlMessages.propagateLayoutLabel),
key: 'propagate layout', key: 'propagate layout',
onClick: amIPresenter ? setMeetingLayout : setPushLayout, onClick: amIPresenter ? setMeetingLayout : setPushLayout,
}); });
} }
if (isLayoutsEnabled()){
actions.push({ actions.push({
icon: 'send', icon: 'send',
label: intl.formatMessage(intlMessages.layoutModal), label: intl.formatMessage(intlMessages.layoutModal),
key: 'layoutModal', key: 'layoutModal',
onClick: () => mountModal(<LayoutModalContainer {...this.props} />), onClick: () => mountModal(<LayoutModalContainer {...this.props} />),
}); });
}
return actions; return actions;
} }