summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webapp/components/admin_console/password_settings.jsx14
-rw-r--r--webapp/i18n/en.json1
2 files changed, 15 insertions, 0 deletions
diff --git a/webapp/components/admin_console/password_settings.jsx b/webapp/components/admin_console/password_settings.jsx
index 9d335c539..6eacb6011 100644
--- a/webapp/components/admin_console/password_settings.jsx
+++ b/webapp/components/admin_console/password_settings.jsx
@@ -80,6 +80,19 @@ export default class PasswordSettings extends AdminSettings {
return config;
}
+ getStateFromConfig(config) {
+ return {
+ passwordMinimumLength: config.PasswordSettings.MinimumLength,
+ passwordLowercase: config.PasswordSettings.Lowercase,
+ passwordNumber: config.PasswordSettings.Number,
+ passwordUppercase: config.PasswordSettings.Uppercase,
+ passwordSymbol: config.PasswordSettings.Symbol,
+ maximumLoginAttempts: config.ServiceSettings.MaximumLoginAttempts,
+ enableMultifactorAuthentication: config.ServiceSettings.EnableMultifactorAuthentication,
+ passwordResetSalt: config.EmailSettings.PasswordResetSalt
+ };
+ }
+
getSampleErrorMsg() {
if (this.props.config.PasswordSettings.MinimumLength > Constants.MAX_PASSWORD_LENGTH || this.props.config.PasswordSettings.MinimumLength < Constants.MIN_PASSWORD_LENGTH) {
return (
@@ -161,6 +174,7 @@ export default class PasswordSettings extends AdminSettings {
defaultMessage='Minimum Password Length:'
/>
}
+ placeholder={Utils.localizeMessage('admin.password.minimumLengthExample', 'Ex "5"')}
helpText={
<FormattedMessage
id='admin.password.minimumLengthDescription'
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 0547af506..b7d531beb 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -410,6 +410,7 @@
"admin.password.lowercase": "At least one lowercase letter",
"admin.password.minimumLength": "Minimum Password Length:",
"admin.password.minimumLengthDescription": "Minimum number of characters required for a valid password. Must be a whole number greater than or equal to {min} and less than or equal to {max}.",
+ "admin.password.minimumLengthExample": "Ex \"5\"",
"admin.password.number": "At least one number",
"admin.password.preview": "Error message preview",
"admin.password.requirements": "Password Requirements:",