Yaniv Bronhaim has uploaded a new change for review. Change subject: ui: validate field fix in add Provider form ......................................................................
ui: validate field fix in add Provider form 1. On test fail if authentication parameters are missing 2. Don't accept empty url Change-Id: Iafcb126db61fe1ac1b4b668a78c3b09b95fefe90 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1125961 Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 2 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/32169/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java index 1199682..17babb2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java @@ -224,8 +224,13 @@ private boolean validate() { getName().validateEntity(new IValidation[] { new NotEmptyValidation(), new AsciiNameValidation() }); getType().validateSelectedItem(new IValidation[] { new NotEmptyValidation() }); - getUsername().validateEntity(new IValidation[] { new NotEmptyValidation() }); - getPassword().validateEntity(new IValidation[] { new NotEmptyValidation() }); + if (requiresAuthentication.getEntity()) { + getUsername().validateEntity(new IValidation[] { new NotEmptyValidation() }); + getPassword().validateEntity(new IValidation[] { new NotEmptyValidation() }); + } else { + getUsername().setIsValid(true); + getPassword().setIsValid(true); + } getTenantName().validateEntity(new IValidation[] { new NotEmptyValidation()} ); getUrl().validateEntity(new IValidation[] { new NotEmptyValidation(), new UrlValidation(Uri.SCHEME_HTTP, Uri.SCHEME_HTTPS) }); @@ -304,6 +309,13 @@ private void onTest() { flush(); + if (provider.getUrl() == null || provider.getUrl().equals(ConstantsManager.getInstance().getConstants().empty()) + || + (requiresAuthentication.getEntity() && provider.getUsername() != null && + provider.getUsername().equals(ConstantsManager.getInstance().getConstants().empty()))) { + getTestResult().setEntity(ConstantsManager.getInstance().getConstants().testFailedInsufficentParams()); + return; + } startProgress(null); Frontend.getInstance().runAction(VdcActionType.TestProviderConnectivity, new ProviderParameters(provider), 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 969fa78..ebc1372 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 @@ -2424,5 +2424,8 @@ @DefaultStringValue("CPU Profile") String cpuProfileTitle(); + + @DefaultStringValue("Insufficient parameters to test connectivity") + String testFailedInsufficentParams(); } -- To view, visit http://gerrit.ovirt.org/32169 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iafcb126db61fe1ac1b4b668a78c3b09b95fefe90 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
