diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx index d855c31fc9f9c0a8f637c1791aeb0acf3093242e..138993df3dd4d870c12bac8a92151aed1363c4d4 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx @@ -74,18 +74,11 @@ export default class ActionsBar extends Component { } render() { - if (this.props.userIsPresenter) { - return ( - <div> - {this.renderForPresenter()} - </div> - ); - } else { - return ( - <div> - {this.renderForUser()} - </div> - ); - } + const { isUserPresenter } = this.props; + return( + <div> + {isUserPresenter ? this.renderForPresenter() : this.renderForUser()} + </div> + ); } } diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js index 223f054923dcc63074e2c9782fdb5cc34ee9673b..61335496542dbdade735cbd08bbedc059080ff5f 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/service.js +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/service.js @@ -2,15 +2,14 @@ import AuthSingleton from '/imports/ui/services/auth/index.js'; import Users from '/imports/api/users'; let isUserPresenter = () => { - let userIsPresenter; - // Get user to check if they are the presenter - userIsPresenter = Users.findOne({ + // check if user is a presenter + let isPresenter = Users.findOne({ userId: AuthSingleton.getCredentials().requesterUserId, }).user.presenter; return { - userIsPresenter: userIsPresenter, + isUserPresenter: isPresenter, }; };