fixed password reset salt broken (#3778)

Этот коммит содержится в:
David Lu
2016-08-10 15:20:52 -04:00
коммит произвёл enahum
родитель 379efb0a33
Коммит bd106bb401

Просмотреть файл

@@ -34,6 +34,8 @@ export default class PasswordSettings extends AdminSettings {
}); });
// Update sample message from config settings // Update sample message from config settings
this.sampleErrorMsg = null;
if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.PasswordRequirements === 'true') {
let sampleErrorMsgId = 'user.settings.security.passwordError'; let sampleErrorMsgId = 'user.settings.security.passwordError';
if (props.config.PasswordSettings.Lowercase) { if (props.config.PasswordSettings.Lowercase) {
sampleErrorMsgId = sampleErrorMsgId + 'Lowercase'; sampleErrorMsgId = sampleErrorMsgId + 'Lowercase';
@@ -57,6 +59,7 @@ export default class PasswordSettings extends AdminSettings {
/> />
); );
} }
}
componentWillUpdate() { componentWillUpdate() {
this.sampleErrorMsg = this.getSampleErrorMsg(); this.sampleErrorMsg = this.getSampleErrorMsg();
@@ -94,6 +97,7 @@ export default class PasswordSettings extends AdminSettings {
} }
getSampleErrorMsg() { getSampleErrorMsg() {
if (global.window.mm_license.IsLicensed === 'true' && global.window.mm_license.PasswordRequirements === 'true') {
if (this.props.config.PasswordSettings.MinimumLength > Constants.MAX_PASSWORD_LENGTH || this.props.config.PasswordSettings.MinimumLength < Constants.MIN_PASSWORD_LENGTH) { if (this.props.config.PasswordSettings.MinimumLength > Constants.MAX_PASSWORD_LENGTH || this.props.config.PasswordSettings.MinimumLength < Constants.MIN_PASSWORD_LENGTH) {
return ( return (
<FormattedMessage <FormattedMessage
@@ -127,6 +131,9 @@ export default class PasswordSettings extends AdminSettings {
); );
} }
return null;
}
renderTitle() { renderTitle() {
return ( return (
<h3> <h3>