fix(preferences(js)): show error when passwords don't match
parent
2300fe8aab
commit
0e7ce3129c
|
@ -242,6 +242,7 @@
|
||||||
"New password" = "New password";
|
"New password" = "New password";
|
||||||
"Confirmation" = "Confirmation";
|
"Confirmation" = "Confirmation";
|
||||||
"Change" = "Change";
|
"Change" = "Change";
|
||||||
|
"Passwords don't match" = "Passwords don't match";
|
||||||
|
|
||||||
/* Event+task classifications */
|
/* Event+task classifications */
|
||||||
"Default events classification" = "Default events classification";
|
"Default events classification" = "Default events classification";
|
||||||
|
|
|
@ -272,15 +272,17 @@
|
||||||
</label>
|
</label>
|
||||||
<input type="password" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/>
|
<input type="password" sg-no-dirty-check="true" ng-model="app.passwords.newPassword"/>
|
||||||
</md-input-container>
|
</md-input-container>
|
||||||
|
|
||||||
<md-input-container class="md-block" flex="50">
|
<md-input-container class="md-block" flex="50">
|
||||||
<label><var:string label:value="Confirmation"/>
|
<label><var:string label:value="Confirmation"/>
|
||||||
</label>
|
</label>
|
||||||
<input type="password" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/>
|
<input type="password" name="newPasswordConfirmation" sg-no-dirty-check="true" ng-model="app.passwords.newPasswordConfirmation"/>
|
||||||
|
<div ng-messages="preferencesForm.newPasswordConfirmation.$error">
|
||||||
|
<div ng-message="newPasswordMismatch"><var:string label:value="Passwords don't match"/></div>
|
||||||
|
</div>
|
||||||
</md-input-container>
|
</md-input-container>
|
||||||
</div>
|
</div>
|
||||||
<div layout="row" layout-align="end center">
|
<div layout="row" layout-align="end center">
|
||||||
<md-button ng-click="app.changePassword()" type="button" ng-disabled="!app.canChangePassword()">
|
<md-button ng-click="app.changePassword()" type="button" ng-disabled="!app.canChangePassword(preferencesForm)">
|
||||||
<var:string label:value="Change"/>
|
<var:string label:value="Change"/>
|
||||||
</md-button>
|
</md-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -462,7 +462,13 @@
|
||||||
return $q.reject('Invalid form');
|
return $q.reject('Invalid form');
|
||||||
};
|
};
|
||||||
|
|
||||||
this.canChangePassword = function() {
|
this.canChangePassword = function(form) {
|
||||||
|
if (this.passwords.newPasswordConfirmation && this.passwords.newPasswordConfirmation.length &&
|
||||||
|
this.passwords.newPassword != this.passwords.newPasswordConfirmation) {
|
||||||
|
form.newPasswordConfirmation.$setValidity('newPasswordMismatch', false);
|
||||||
|
} else {
|
||||||
|
form.newPasswordConfirmation.$setValidity('newPasswordMismatch', true);
|
||||||
|
}
|
||||||
if (this.passwords.newPassword && this.passwords.newPassword.length > 0 &&
|
if (this.passwords.newPassword && this.passwords.newPassword.length > 0 &&
|
||||||
this.passwords.newPasswordConfirmation && this.passwords.newPasswordConfirmation.length &&
|
this.passwords.newPasswordConfirmation && this.passwords.newPasswordConfirmation.length &&
|
||||||
this.passwords.newPassword == this.passwords.newPasswordConfirmation &&
|
this.passwords.newPassword == this.passwords.newPasswordConfirmation &&
|
||||||
|
|
Loading…
Reference in New Issue