Lior Vernia has uploaded a new change for review. Change subject: webadmin: Fix subnet format error message ......................................................................
webadmin: Fix subnet format error message Previous message talked of "IP address", now of subet. Change-Id: I105493febb618cbd0e9bb20991e064cb9c81c428 Bug-Url: https://bugzilla.redhat.com/1062603 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 2 files changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/24987/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java index 85d089e..95d9462 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java @@ -7,7 +7,6 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; -@SuppressWarnings("unused") public class SubnetMaskValidation implements IValidation { private final static IpAddressValidation IP_VALIDATOR = new IpAddressValidation(); @@ -32,6 +31,10 @@ public ValidationResult validate(Object value) { ValidationResult ipValidation = IP_VALIDATOR.validate(value); if (!ipValidation.getSuccess()) { + ipValidation.getReasons().clear(); + ipValidation.getReasons().add(ConstantsManager.getInstance() + .getConstants() + .thisFieldMustContainSubnetInFormatMsg()); return ipValidation; } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index b3ca124..671cb55 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -842,6 +842,9 @@ @DefaultStringValue("This field must contain an IP address in format xxx.xxx.xxx.xxx") String thisFieldMustContainIPaddressInFormatMsg(); + @DefaultStringValue("This field must contain a subnet in format xxx.xxx.xxx.xxx") + String thisFieldMustContainSubnetInFormatMsg(); + @DefaultStringValue("This field must contain a CIDR in format xxx.xxx.xxx.xxx/yy") String thisFieldMustContainCidrInFormatMsg(); -- To view, visit http://gerrit.ovirt.org/24987 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I105493febb618cbd0e9bb20991e064cb9c81c428 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
