Tal Nisan has uploaded a new change for review. Change subject: webadmin: Added tooltip for mount options in new storage dialog ......................................................................
webadmin: Added tooltip for mount options in new storage dialog Added an explanation tooltip in the mount options option in NFS new storage domain dialog and Posix new storage domain dialog Change-Id: Ieded652097ecd17f17ee27678b57818f4ca88be2 Bug-Url: https://bugzilla.redhat.com/1109053 Signed-off-by: Tal Nisan <tni...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java 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/UIConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java 4 files changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/30860/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java index 2a7fae5..ae91abb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/NfsStorageModel.java @@ -186,6 +186,7 @@ getRetransmissions().setIsChangable(isChangeable); getTimeout().setIsChangable(isChangeable); getMountOptions().setIsChangable(isChangeable); + getMountOptions().setTitle(isChangeable ? ConstantsManager.getInstance().getConstants().mountOptionsHint() : null); } @Override 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 de02bb5..5fcda5b 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 @@ -87,6 +87,7 @@ setVfsType(new EntityModel<String>()); getVfsType().setTitle(ConstantsManager.getInstance().getConstants().posixVfsTypeHint()); setMountOptions(new EntityModel<String>()); + getMountOptions().setTitle(ConstantsManager.getInstance().getConstants().mountOptionsHint()); } @Override 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 edb57a8..652d4db 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 @@ -1968,6 +1968,9 @@ @DefaultStringValue("Enter a valid FS type (e.g. nfs/glusterfs/cifs/smbfs etc.") String posixVfsTypeHint(); + @DefaultStringValue("Enter additional Mount Options, as you would normally provide them to the mount command using the -o argument.\nThe mount options should be provided in a comma-separated list. See man mount for a list of valid mount options.") + String mountOptionsHint(); + @DefaultStringValue("Event Details") String eventDetailsTitle(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java index 05e55ee..97f1f1f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/NfsStorageView.java @@ -17,6 +17,10 @@ import org.ovirt.engine.ui.common.widget.uicommon.storage.AbstractStorageView; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.storage.NfsStorageModel; +import org.ovirt.engine.ui.uicompat.Event; +import org.ovirt.engine.ui.uicompat.EventArgs; +import org.ovirt.engine.ui.uicompat.IEventListener; +import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.gin.ClientGinjectorProvider; @@ -177,7 +181,7 @@ } @Override - public void edit(NfsStorageModel object) { + public void edit(final NfsStorageModel object) { driver.edit(object); EntityModel version = (EntityModel) object.getVersion().getSelectedItem(); @@ -185,6 +189,15 @@ pathHintLabel.setVisible(object.getPath().getIsChangable()); + object.getMountOptions().getPropertyChangedEvent().addListener(new IEventListener() { + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + if (((PropertyChangedEventArgs)args).propertyName.equals("Title")) { //$NON-NLS-1$ + mountOptionsEditor.setTitle(object.getMountOptions().getTitle()); + } + } + }); + styleTextBoxEditor(pathEditor, object.getPath().getIsChangable()); styleTextBoxEditor(timeoutEditor, object.getOverride().getIsChangable()); styleTextBoxEditor(retransmissionsEditor, object.getOverride().getIsChangable()); -- To view, visit http://gerrit.ovirt.org/30860 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieded652097ecd17f17ee27678b57818f4ca88be2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
