Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: i18n validation in import vm/temp ......................................................................
webadmin: i18n validation in import vm/temp Instead of very limited name validation Change-Id: I5640c943f2f5144e851dfd7660093b083ccc8530 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Gilad Chaplik <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java 2 files changed, 9 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/11150/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java index 26599a6..2ad0115 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java @@ -35,9 +35,10 @@ import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateImportDiskListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportVmModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmAppListModel; +import org.ovirt.engine.ui.uicommonweb.validation.I18NNameValidation; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; +import org.ovirt.engine.ui.uicommonweb.validation.LengthValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; -import org.ovirt.engine.ui.uicommonweb.validation.RegexValidation; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; @@ -148,20 +149,14 @@ @Override protected boolean validateName(String newVmName, Object object, EntityModel entity) { - String nameExpr; - String nameMsg; - nameExpr = "^[0-9a-zA-Z-_]{1," + 49 + "}$"; //$NON-NLS-1$ //$NON-NLS-2$ - nameMsg = - ConstantsManager.getInstance() - .getMessages() - .newNameWithSuffixCannotContainBlankOrSpecialChars(40); EntityModel temp = new EntityModel(); temp.setIsValid(true); temp.setEntity(newVmName); temp.ValidateEntity( new IValidation[] { new NotEmptyValidation(), - new RegexValidation(nameExpr, nameMsg) + new LengthValidation(40), + new I18NNameValidation() }); if (!temp.getIsValid()) { entity.setInvalidityReasons(temp.getInvalidityReasons()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index 52dd9f5..e3f6e11 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -37,9 +37,10 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.ImportVmModel; import org.ovirt.engine.ui.uicommonweb.models.vms.UnitVmModel; import org.ovirt.engine.ui.uicommonweb.models.vms.VmAppListModel; +import org.ovirt.engine.ui.uicommonweb.validation.I18NNameValidation; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; +import org.ovirt.engine.ui.uicommonweb.validation.LengthValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; -import org.ovirt.engine.ui.uicommonweb.validation.RegexValidation; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; @@ -292,33 +293,17 @@ } protected boolean validateName(String newVmName, Object object, EntityModel entity) { - String nameExpr; - String nameMsg; VM vm = (VM) object; VmOsType osType = vm.getOs(); - if (AsyncDataProvider.IsWindowsOsType(osType)) - { - nameExpr = "^[0-9a-zA-Z-_]{1," + UnitVmModel.WINDOWS_VM_NAME_MAX_LIMIT + "}$"; //$NON-NLS-1$ //$NON-NLS-2$ - nameMsg = - ConstantsManager.getInstance() - .getMessages() - .newNameWithSuffixCannotContainBlankOrSpecialChars(UnitVmModel.WINDOWS_VM_NAME_MAX_LIMIT); - } - else - { - nameExpr = "^[-\\w]{1," + UnitVmModel.NON_WINDOWS_VM_NAME_MAX_LIMIT + "}$"; //$NON-NLS-1$ //$NON-NLS-2$ - nameMsg = - ConstantsManager.getInstance() - .getMessages() - .newNameWithSuffixCannotContainBlankOrSpecialChars(UnitVmModel.NON_WINDOWS_VM_NAME_MAX_LIMIT); - } EntityModel temp = new EntityModel(); temp.setIsValid(true); temp.setEntity(newVmName); temp.ValidateEntity( new IValidation[] { new NotEmptyValidation(), - new RegexValidation(nameExpr, nameMsg) + new LengthValidation(AsyncDataProvider.IsWindowsOsType(osType) ? UnitVmModel.WINDOWS_VM_NAME_MAX_LIMIT + : UnitVmModel.NON_WINDOWS_VM_NAME_MAX_LIMIT), + new I18NNameValidation() }); if (!temp.getIsValid()) { entity.setInvalidityReasons(temp.getInvalidityReasons()); -- To view, visit http://gerrit.ovirt.org/11150 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5640c943f2f5144e851dfd7660093b083ccc8530 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
