Yaniv Bronhaim has uploaded a new change for review. Change subject: ui: Clean fields and load new provider info when selected provider is changed ......................................................................
ui: Clean fields and load new provider info when selected provider is changed Change-Id: Ie01a6c8b6d6f7e58a6057fc211ab5e4605bbe310 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 2 files changed, 20 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/29639/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 a38eefa..02d525e 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 @@ -1869,6 +1869,14 @@ 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); } 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 c679138..8d1ad8b 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 @@ -41,21 +41,21 @@ }); getExternalDiscoveredHosts().setIsAvailable(ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly); - getIsDiscorveredHosts().getEntityChangedEvent().addListener(new IEventListener() { - @Override - public void eventRaised(Event ev, Object sender, EventArgs args) { - cleanHostParametersFields(); - if (getIsDiscorveredHosts().getEntity() != null) { - updateHostList(getIsDiscorveredHosts().getEntity()); - } - } - }); getExternalHostProviderEnabled().setIsAvailable(ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly); getProviders().getSelectedItemChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { + // While load don't let user to change provider + getProviders().setIsChangable(false); providers_SelectedItemChanged(); + if (getIsDiscorveredHosts().getEntity() != null) { + updateHostList(getIsDiscorveredHosts().getEntity()); + } else { + // Before we picked discovered or not, load all + updateHostList(true); + updateHostList(false); + } } }); @@ -90,6 +90,7 @@ } private void providers_SelectedItemChanged() { + cleanHostParametersFields(); Provider provider = getProviders().getSelectedItem(); setEnableSearchHost(provider != null); } @@ -111,6 +112,7 @@ hostNameListModel.setItems(hosts); hostNameListModel.setIsChangable(true); setEnableSearchHost(true); + getProviders().setIsChangable(true); } }; AsyncDataProvider.getExternalProviderHostList(getHostsQuery, provider.getId(), true, getProviderSearchFilter().getEntity()); @@ -124,6 +126,7 @@ ListModel externalDiscoveredHostsListModel = getExternalDiscoveredHosts(); externalDiscoveredHostsListModel.setItems(hosts); externalDiscoveredHostsListModel.setIsChangable(true); + getProviders().setIsChangable(true); } }; AsyncDataProvider.getExternalProviderDiscoveredHostList(getDiscoveredHostsQuery, provider); -- To view, visit http://gerrit.ovirt.org/29639 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie01a6c8b6d6f7e58a6057fc211ab5e4605bbe310 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
