scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #802 from rschamp/hotfix/waiting-room-loop

Browse source 
[Develop] Only redirect approved educators to My Classes
This commit is contained in:
Ray Schamp 2016-08-02 11:24:01 -04:00 committed by GitHub
commit c55595fbc3
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/views/teacherwaitingroom/teacherwaitingroom.jsx
View file

@ -11,27 +11,28 @@ require('./teacherwaitingroom.scss');
var TeacherWaitingRoom = React.createClass({ var TeacherWaitingRoom = React.createClass({
displayName: 'TeacherWaitingRoom', displayName: 'TeacherWaitingRoom',
componentWillReceiveProps: function (nextProps) { componentWillReceiveProps: function (nextProps) {
if (nextProps.session.permissions.educator && nextProps.session.permissions.social) { if (nextProps.approved) {
window.location.href = '/educators/classes/'; window.location.href = '/educators/classes/';
} }
}, },
render: function () { render: function () {
var permissions = this.props.session.permissions || {};
var user = this.props.session.user || {};
return ( return (
<Deck className={classNames('teacher-waitingroom', this.props.className)}> <Deck className={classNames('teacher-waitingroom', this.props.className)}>
<TeacherApprovalStep confirmed={permissions.social} <TeacherApprovalStep {... this.props} />
invited={permissions.educator_invitee}
educator={permissions.educator}
email={user.email} />
</Deck> </Deck>
); );
} }
}); });
var mapStateToProps = function (state) { var mapStateToProps = function (state) {
var permissions = state.session.session.permissions || {};
var user = state.session.session.user || {};
return { return {
session: state.session.session approved: permissions && permissions.educator && !permissions.educator_invitee && permissions.social,
confirmed: permissions && permissions.social,
invited: permissions && permissions.educator_invitee,
educator: permissions && permissions.educator,
email: user && user.email
}; };
}; };