Skip to content

Commit

Permalink
#657 add missing error message
Browse files Browse the repository at this point in the history
  • Loading branch information
syjer committed Aug 1, 2019
1 parent af6b3eb commit fbbc3ad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 4 additions & 2 deletions src/main/java/alfio/util/Validator.java
Original file line number Diff line number Diff line change
Expand Up @@ -280,15 +280,17 @@ public static ValidationResult validateTicketAssignment(UpdateTicketOwnerForm fo
}

if(!fieldConf.getRestrictedValues().isEmpty()) {
validateRestrictedValue(formValue, prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]", "error."+fieldConf.getName(), fieldConf.getRestrictedValues(), errors);
validateRestrictedValue(formValue, prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]",
"error.restrictedValue", fieldConf.getRestrictedValues(), errors);
}

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

if(fieldConf.hasDisabledValues() && fieldConf.getDisabledValues().contains(formValue)) {
errors.rejectValue(prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]", "error."+fieldConf.getName());
errors.rejectValue(prefixForLambda + "additional["+fieldConf.getName()+"]["+i+"]",
"error.disabledValue", null, null);
}

try {
Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/alfio/i18n/public.properties
Original file line number Diff line number Diff line change
Expand Up @@ -413,4 +413,6 @@ invoice.type=Invoice Type
invoice.type.private=Private Customer
invoice.type.business=Business Customer

error.tooShort=Value is too short: minimum length is {0} characters
error.tooShort=Value is too short: minimum length is {0} characters
error.restrictedValue=Value is not valid
error.disabledValue=Value is disabled

0 comments on commit fbbc3ad

Please sign in to comment.