From 768e1afd1a96f781aed1c72c0781a4a614f04830 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Mon, 30 Jul 2018 09:32:13 +0200 Subject: [PATCH] Minor changes due to review --- scm-ui/public/locales/en/users.json | 2 +- scm-ui/src/users/components/UserForm.js | 2 +- .../{userValidator.test.js => userValidation.test.js} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename scm-ui/src/users/components/{userValidator.test.js => userValidation.test.js} (100%) diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json index 0ffb85e890..c0b55adf7e 100644 --- a/scm-ui/public/locales/en/users.json +++ b/scm-ui/public/locales/en/users.json @@ -45,7 +45,7 @@ "mail-invalid": "This email is invalid", "name-invalid": "This name is invalid", "displayname-invalid": "This displayname is invalid", - "password-invalid": "Password has to be at least six characters", + "password-invalid": "Password has to be between 6 and 32 characters", "passwordValidation-invalid": "Passwords have to be the same", "validatePassword": "Please validate password here" } diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js index b9df54cac3..39189ca127 100644 --- a/scm-ui/src/users/components/UserForm.js +++ b/scm-ui/src/users/components/UserForm.js @@ -66,7 +66,7 @@ class UserForm extends React.Component { this.state.validatePasswordError || this.state.nameValidationError || this.state.mailValidationError || - this.state.validatePasswordError || + this.state.passwordValidationError || this.state.displayNameValidationError || this.isFalsy(user.name) || this.isFalsy(user.displayName) diff --git a/scm-ui/src/users/components/userValidator.test.js b/scm-ui/src/users/components/userValidation.test.js similarity index 100% rename from scm-ui/src/users/components/userValidator.test.js rename to scm-ui/src/users/components/userValidation.test.js