Skip to content

Commit

Permalink
#657 use pre-defined error message for empty and too long value
Browse files Browse the repository at this point in the history
  • Loading branch information
syjer committed Jul 23, 2019
1 parent b463e17 commit c7f396e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/java/alfio/util/Validator.java
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public static ValidationResult validateTicketAssignment(UpdateTicketOwnerForm fo
form.setAdditional(new HashMap<>());
}
form.getAdditional().put(fieldConf.getName(), Collections.singletonList(""));
errors.rejectValue(prefixForLambda + "additional["+fieldConf.getName()+"][0]", "error."+fieldConf.getName());
errors.rejectValue(prefixForLambda + "additional["+fieldConf.getName()+"][0]", "error.emptyField");
}
continue;
}
Expand All @@ -272,7 +272,7 @@ public static ValidationResult validateTicketAssignment(UpdateTicketOwnerForm fo
for(int i = 0; i < values.size(); i++) {
String formValue = values.get(i);
if(fieldConf.isMaxLengthDefined()) {
validateMaxLength(formValue, prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]", "error."+fieldConf.getName(), fieldConf.getMaxLength(), errors);
validateMaxLength(formValue, prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]", "error.tooLong", fieldConf.getMaxLength(), errors);
}

if(StringUtils.isNotBlank(formValue) && fieldConf.isMinLengthDefined() && StringUtils.length(formValue) < fieldConf.getMinLength()) {
Expand All @@ -284,7 +284,7 @@ public static ValidationResult validateTicketAssignment(UpdateTicketOwnerForm fo
}

if(fieldConf.isRequired() && StringUtils.isBlank(formValue)){
errors.rejectValue(prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]", "error."+fieldConf.getName());
errors.rejectValue(prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]", "error.emptyField");
}

if(fieldConf.hasDisabledValues() && fieldConf.getDisabledValues().contains(formValue)) {
Expand Down

0 comments on commit c7f396e

Please sign in to comment.