Tal Nisan has uploaded a new change for review. Change subject: webadmin: Added POSIX VFS validation & hint on storage create ......................................................................
webadmin: Added POSIX VFS validation & hint on storage create Added a validation of special characters to a VFS type when creating a POSIX domain to allow only ascii characters, also added a tooltip hint on the input field to explain and show common types Change-Id: I6a34d269da73f1b42b2b2917469f8ea337ca51ee Signed-off-by: Tal Nisan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/PosixStorageModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java 3 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/13521/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/PosixStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/PosixStorageModel.java index 7af9699..ad8cdbd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/PosixStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/PosixStorageModel.java @@ -5,8 +5,10 @@ import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.Model; +import org.ovirt.engine.ui.uicommonweb.validation.AsciiNameValidation; import org.ovirt.engine.ui.uicommonweb.validation.IValidation; import org.ovirt.engine.ui.uicommonweb.validation.NotEmptyValidation; +import org.ovirt.engine.ui.uicompat.ConstantsManager; @SuppressWarnings("unused") public class PosixStorageModel extends Model implements IStorageModel { @@ -83,6 +85,7 @@ setPath(new EntityModel()); setVfsType(new EntityModel()); + getVfsType().setTitle(ConstantsManager.getInstance().getConstants().posixVfsTypeHint()); setMountOptions(new EntityModel()); } @@ -96,9 +99,7 @@ ); getVfsType().ValidateEntity( - new IValidation[] { - new NotEmptyValidation(), - } + new IValidation[] { new NotEmptyValidation(), new AsciiNameValidation() } ); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index 436a0f9..d145b02 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -1769,4 +1769,7 @@ @DefaultStringValue("There can be only one bootable disk defined") String onlyOneBootableDisk(); + + @DefaultStringValue("Enter a valid FS type (eg. nfs/glusterfs/cifs/smbfs etc..") + String posixVfsTypeHint(); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java index cbb4e81..4df49e1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/PosixStorageView.java @@ -118,6 +118,8 @@ valueBox.setReadOnly(true); valueBox.getElement().getStyle().setBorderWidth(0, Style.Unit.PX); } + + editor.asValueBox().setTitle(model.getTitle()); } @Override -- To view, visit http://gerrit.ovirt.org/13521 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a34d269da73f1b42b2b2917469f8ea337ca51ee Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
