Commit 3125ccae authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'riri' into 'master'

reset apdet

See merge request !166
parents 625cf9e2 cdadc023
......@@ -20,8 +20,8 @@ class ResetPassword extends Component {
showPass2: false,
errorPassword: false,
errorConfirmPassword: false,
msgPassword: 'Password minimum 8 characters!.',
msgConfirmPassword: 'Terdiri 8 karakter dengan kombinasi angka.',
msgPassword: 'Consists of 8 characters with a combination of numbers!.',
msgConfirmPassword: 'Consists of 8 characters with a combination of numbers!.',
userId: 0,
alert: false,
tipeAlert: '',
......@@ -71,7 +71,7 @@ class ResetPassword extends Component {
} else if (this.isEmail(this.state.password)) {
this.setState({ errorPassword: true, msgPassword: 'Password format should not use email!' })
} else if (!this.isRegex(this.state.password)) {
this.setState({ errorPassword: true, msgPassword: 'The password must be a combination of characters, letters and numbers!' })
this.setState({ errorPassword: true, msgPassword: 'Password must be a combination of characters, letters and numbers!' })
} else if (this.state.confirmPassword.trim() == "") {
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Confirm password cannot be empty!' })
} else if (this.state.confirmPassword.length < 8) {
......@@ -81,7 +81,7 @@ class ResetPassword extends Component {
} else if (!this.isRegex(this.state.confirmPassword)) {
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Password confirmation must be a combination of characters, letters and numbers!' })
} else if (this.state.password !== this.state.confirmPassword) {
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'The confirmation password must match the password!' })
this.setState({ errorConfirmPassword: true, msgConfirmPassword: 'Confirmation password must match the password!' })
} else {
this.confirmPassword()
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment