Merge pull request #836 from mewtaylor/issue/gh-760

Fix GH-760: Add username `not equals` to password validation

src/components/footer/conference/footer.scss

@@ -35,7 +35,7 @@
 
             .intel {
                 img {
-                    max-height: 50px
+                    max-height: 50px;
                 }
             }
         }

src/components/forms/validations.jsx

@@ -23,6 +23,7 @@ module.exports.validations = {
         return phoneNumberUtil.isValidNumber(parsed);
     }
 };
+module.exports.validations.notEqualsUsername = module.exports.validations.notEquals;
 
 module.exports.validationHOCFactory = function (defaultValidationErrors) {
     return function (Component) {

src/components/login/login.scss

@@ -7,11 +7,11 @@
         padding-top: 5px;
         font-weight: bold;
     }
-    
+
     .right {
         float: right;
     }
-    
+
     .spinner {
         margin: 0 .8rem;
         width: 1rem;

src/components/registration/steps.jsx

@@ -233,6 +233,7 @@ module.exports = {
     ChoosePasswordStep: intl.injectIntl(React.createClass({
         getDefaultProps: function () {
             return {
+                username: null,
                 showPassword: false,
                 waiting: false
             };
@@ -264,7 +265,7 @@ module.exports = {
                                    validations={{
                                        minLength: 6,
                                        notEquals: 'password',
-                                       notEqualsField: 'user.username'
+                                       notEqualsUsername: this.props.username
                                    }}
                                    validationErrors={{
                                        minLength: formatMessage({
@@ -273,7 +274,7 @@ module.exports = {
                                        notEquals: formatMessage({
                                            id: 'registration.validationPasswordNotEquals'
                                        }),
-                                       notEqualsField: formatMessage({
+                                       notEqualsUsername: formatMessage({
                                            id: 'registration.validationPasswordNotUsername'
                                        })
                                    }}

src/main.scss

@@ -164,7 +164,7 @@ dl {
     dt {
         font-weight: 700;
     }
-    
+
     dd {
         margin: 0;
     }

src/views/studentcompleteregistration/studentcompleteregistration.jsx

@@ -132,7 +132,8 @@ var StudentCompleteRegistration = intl.injectIntl(React.createClass({
                             {this.props.must_reset_password ?
                                 <Steps.ChoosePasswordStep onNextStep={this.advanceStep}
                                                           showPassword={true}
-                                                          waiting={this.state.waiting} />
+                                                          waiting={this.state.waiting}
+                                                          username={this.props.studentUsername} />
                             :
                                 []
                             }