Yaniv Bronhaim has uploaded a new change for review. Change subject: ui: fixing addHost form issues when playing with using host provider ......................................................................
ui: fixing addHost form issues when playing with using host provider Apparently hiding the host provider form was buggy. In this patch we fix the fields cleaning and the visability of the provider parameters. Change-Id: I700ec281a1bd1617d0168d59c8daef5b5bcf4f6b Signed-off-by: Yaniv Bronhaim <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NewHostModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java 3 files changed, 13 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/35239/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index 8e51d30..01c3802 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -1858,15 +1858,6 @@ getHost().setEntity(constants.empty()); getUserPassword().setEntity(constants.empty()); getFetchSshFingerprint().setEntity(constants.empty()); - getExternalHostName().setItems(null); - getExternalHostName().setIsChangable(false); - getExternalDiscoveredHosts().setItems(null); - getExternalDiscoveredHosts().setIsChangable(false); - getExternalHostGroups().setItems(null); - getExternalHostGroups().setIsChangable(false); - getExternalComputeResource().setItems(null); - getExternalComputeResource().setIsChangable(false); - } protected abstract boolean showInstallationProperties(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NewHostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NewHostModel.java index f5fff82..c3baae7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NewHostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/NewHostModel.java @@ -70,8 +70,6 @@ vds = new VDS(); } updateModelFromVds(vds, null, false, null); - getName().setIsChangable(false); - getHost().setIsChangable(false); } private void discoverHostName_SelectedItemChanged() { @@ -83,8 +81,6 @@ vds.setHostName(dhost.getIp()); } updateModelFromVds(vds, null, false, null); - getName().setIsChangable(false); - getHost().setIsChangable(false); } private void providers_SelectedItemChanged() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java index 09bbd99..8a6499e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java @@ -727,8 +727,14 @@ public void eventRaised(Event<? extends EventArgs> ev, Object sender, EventArgs args) { boolean showForemanProviders = object.getExternalHostProviderEnabled().getEntity(); providersEditor.setVisible(showForemanProviders); + + // showing or hiding radio buttons provisionedHostSection.setVisible(showForemanProviders); discoveredHostSection.setVisible(showForemanProviders); + + // disabling ip and name textbox when using provisioned hosts + nameEditor.setEnabled(!showForemanProviders); + hostAddressEditor.setEnabled(!showForemanProviders); if (showForemanProviders) { object.updateHosts(); @@ -745,9 +751,11 @@ if (Boolean.TRUE.equals(object.getIsDiscoveredHosts().getEntity())) { rbDiscoveredHost.setValue(true); showDiscoveredHostsWidgets(true); - } else { + object.cleanHostParametersFields(); + } else if (Boolean.FALSE.equals(object.getIsDiscoveredHosts().getEntity())) { rbProvisionedHost.setValue(true); showProvisionedHostsWidgets(true); + object.cleanHostParametersFields(); } } }); @@ -894,11 +902,11 @@ } private void hideProviderWidgets(final HostModel object) { + rbProvisionedHost.setValue(false); + rbDiscoveredHost.setValue(false); usualFormToDiscover(false); showExternalDiscoveredHost(false); showExternalProvisionedHosts(false); - rbProvisionedHost.setValue(false); - rbDiscoveredHost.setValue(false); object.getIsDiscoveredHosts().setEntity(null); } @@ -909,8 +917,8 @@ provisionedHostSection.setVisible(false); discoveredHostSection.setVisible(false); providersEditor.setVisible(false); - discoveredHostsPanel.setVisible(false); - searchProviderPanel.setVisible(false); + showExternalDiscoveredHost(false); + showExternalProvisionedHosts(false); } private void displayPassPkWindow(boolean isPasswordVisible) { @@ -943,8 +951,6 @@ private void usualFormToDiscover(boolean isDiscovered) { if (isDiscovered) { authLabel.setText(constants.hostPopupAuthLabelForExternalHost()); - hostAddressEditor.setEnabled(true); - hostAddressEditor.setVisible(true); } else { authLabel.setText(constants.hostPopupAuthLabel()); displayPassPkWindow(true); -- To view, visit http://gerrit.ovirt.org/35239 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I700ec281a1bd1617d0168d59c8daef5b5bcf4f6b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
