SEC-382: Clean up resource bundle errors.
This commit is contained in:
parent
8dda52eeaa
commit
84671f9d68
|
@ -1,2 +1,6 @@
|
||||||
err.name.webContact.name=Name 3-50 characters is required.
|
err.name=Name 3-50 characters is required.
|
||||||
err.name.webContact.email=Email 3-50 characters is required.
|
err.email=Email 3-50 characters is required.
|
||||||
|
err.permission=Permission is required.
|
||||||
|
err.recipient=Recipient is required.
|
||||||
|
err.permission.invalid=The indicated permission is invalid.
|
||||||
|
err.recipient.length=The recipient is too long (maximum 100 characters).
|
|
@ -38,8 +38,8 @@ public class AddPermissionValidator implements Validator {
|
||||||
public void validate(Object obj, Errors errors) {
|
public void validate(Object obj, Errors errors) {
|
||||||
AddPermission addPermission = (AddPermission) obj;
|
AddPermission addPermission = (AddPermission) obj;
|
||||||
|
|
||||||
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "permission", "err.permission", "Permission is required");
|
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "permission", "err.permission", "Permission is required. *");
|
||||||
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "recipient", "err.recipient", "Recipient is required");
|
ValidationUtils.rejectIfEmptyOrWhitespace(errors, "recipient", "err.recipient", "Recipient is required. *");
|
||||||
|
|
||||||
if (addPermission.getPermission() != null) {
|
if (addPermission.getPermission() != null) {
|
||||||
int permission = addPermission.getPermission().intValue();
|
int permission = addPermission.getPermission().intValue();
|
||||||
|
@ -47,14 +47,14 @@ public class AddPermissionValidator implements Validator {
|
||||||
if ((permission != SimpleAclEntry.NOTHING) && (permission != SimpleAclEntry.ADMINISTRATION)
|
if ((permission != SimpleAclEntry.NOTHING) && (permission != SimpleAclEntry.ADMINISTRATION)
|
||||||
&& (permission != SimpleAclEntry.READ) && (permission != SimpleAclEntry.DELETE)
|
&& (permission != SimpleAclEntry.READ) && (permission != SimpleAclEntry.DELETE)
|
||||||
&& (permission != SimpleAclEntry.READ_WRITE_DELETE)) {
|
&& (permission != SimpleAclEntry.READ_WRITE_DELETE)) {
|
||||||
errors.rejectValue("permission", "err.permission.invalid", "The indicated permission is invalid.");
|
errors.rejectValue("permission", "err.permission.invalid", "The indicated permission is invalid. *");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (addPermission.getRecipient() != null) {
|
if (addPermission.getRecipient() != null) {
|
||||||
if (addPermission.getRecipient().length() > 100) {
|
if (addPermission.getRecipient().length() > 100) {
|
||||||
errors.rejectValue("recipient", "err.recipient.length",
|
errors.rejectValue("recipient", "err.recipient.length",
|
||||||
"The recipient is too long (maximum 100 characters).");
|
"The recipient is too long (maximum 100 characters). *");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,11 +36,11 @@ public class WebContactValidator implements Validator {
|
||||||
WebContact wc = (WebContact) obj;
|
WebContact wc = (WebContact) obj;
|
||||||
|
|
||||||
if ((wc.getName() == null) || (wc.getName().length() < 3) || (wc.getName().length() > 50)) {
|
if ((wc.getName() == null) || (wc.getName().length() < 3) || (wc.getName().length() > 50)) {
|
||||||
errors.rejectValue("name", "err.name", "Name 3-50 characters is required.");
|
errors.rejectValue("name", "err.name", "Name 3-50 characters is required. *");
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((wc.getEmail() == null) || (wc.getEmail().length() < 3) || (wc.getEmail().length() > 50)) {
|
if ((wc.getEmail() == null) || (wc.getEmail().length() < 3) || (wc.getEmail().length() > 50)) {
|
||||||
errors.rejectValue("email", "err.email", "Email 3-50 characters is required.");
|
errors.rejectValue("email", "err.email", "Email 3-50 characters is required. *");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,2 +1,6 @@
|
||||||
err.name.webContact.name=Name 3-50 characters is required.
|
err.name=Name 3-50 characters is required.
|
||||||
err.name.webContact.email=Email 3-50 characters is required.
|
err.email=Email 3-50 characters is required.
|
||||||
|
err.permission=Permission is required.
|
||||||
|
err.recipient=Recipient is required.
|
||||||
|
err.permission.invalid=The indicated permission is invalid.
|
||||||
|
err.recipient.length=The recipient is too long (maximum 100 characters).
|
Loading…
Reference in New Issue