scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update from feedback

Browse source 
use props for username rather than constructed form data, and `studentUsername -> username`. Thanks @rschamp!
This commit is contained in:
Matthew Taylor 2016-08-12 10:11:14 -04:00
parent cbf76ec636
commit f8de61f067
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/components/registration/steps.jsx
View file

@ -226,7 +226,7 @@ module.exports = {
ChoosePasswordStep: intl.injectIntl(React.createClass({ ChoosePasswordStep: intl.injectIntl(React.createClass({
getDefaultProps: function () { getDefaultProps: function () {
return { return {
studentUsername: null, username: null,
showPassword: false, showPassword: false,
waiting: false waiting: false
}; };
@ -258,7 +258,7 @@ module.exports = {
validations={{ validations={{
minLength: 6, minLength: 6,
notEquals: 'password', notEquals: 'password',
notEqualsUsername: this.props.studentUsername notEqualsUsername: this.props.username
}} }}
validationErrors={{ validationErrors={{
minLength: formatMessage({ minLength: formatMessage({
@ -880,11 +880,7 @@ module.exports = {
}; };
}, },
onNextStep: function () { onNextStep: function () {
this.props.onNextStep({ this.props.onNextStep();
user: {
username: this.props.studentUsername
}
});
}, },
render: function () { render: function () {
var formatMessage = this.props.intl.formatMessage; var formatMessage = this.props.intl.formatMessage;

5
src/views/studentcompleteregistration/studentcompleteregistration.jsx
View file

@ -133,10 +133,7 @@ var StudentCompleteRegistration = intl.injectIntl(React.createClass({
<Steps.ChoosePasswordStep onNextStep={this.advanceStep} <Steps.ChoosePasswordStep onNextStep={this.advanceStep}
showPassword={true} showPassword={true}
waiting={this.state.waiting} waiting={this.state.waiting}
studentUsername={ username={this.props.studentUsername} />
this.state.formData.user &&
this.state.formData.user.username
} />
: :
[] []
} }