Lior Vernia has uploaded a new change for review. Change subject: webadmin: Only display gateway if feature supported ......................................................................
webadmin: Only display gateway if feature supported Set the visibility of the gateway field, when editing a non-management host network, according to whether the multiple gateway feature is supported, so it wouldn't show in older clusters. Change-Id: Ic31614a9a86e68a0840331f63ec2ac711ab8ac5f Bug-Url: https://bugzilla.redhat.com/1008999 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java 5 files changed, 26 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/19582/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java index d037005..7479992 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java @@ -2797,6 +2797,19 @@ getConfigFromCache(tempVar, aQuery); } + public static void isMultipleGatewaysSupported(String version, AsyncQuery query) { + query.converterCallback = new IAsyncConverter() { + @Override + public Object Convert(Object result, AsyncQuery query) { + return result != null ? ((Boolean) result).booleanValue() : true; + } + }; + GetConfigurationValueParameters parameters = + new GetConfigurationValueParameters(ConfigurationValues.MultipleGatewaysSupported); + parameters.setVersion(version); + getConfigFromCache(parameters, query); + } + public static void fillTagsRecursive(tags tagToFill, List<tags> children) { ArrayList<tags> list = new ArrayList<tags>(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java index 897713b..2bfba7f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceModel.java @@ -244,6 +244,7 @@ setAddress(new EntityModel()); setSubnet(new EntityModel()); setGateway(new EntityModel()); + getGateway().setIsAvailable(false); setNetwork(new ListModel()); getNetwork().getSelectedItemChangedEvent().addListener(this); setName(new EntityModel()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index feefc10..07ae83d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -315,9 +315,21 @@ .getMessages() .editNetworkTitle(logicalNetwork.getName())); networkDialogModel.setOriginalNetParams(netToBeforeSyncParams.get(logicalNetwork.getName())); + networkDialogModel.getAddress().setEntity(entity.getAddress()); networkDialogModel.getSubnet().setEntity(entity.getSubnet()); networkDialogModel.getGateway().setEntity(entity.getGateway()); + networkDialogModel.startProgress(null); + AsyncDataProvider.isMultipleGatewaysSupported(getEntity().getVdsGroupCompatibilityVersion().getValue(), + new AsyncQuery(this, new INewAsyncCallback() { + + @Override + public void onSuccess(Object model, Object returnValue) { + networkDialogModel.stopProgress(); + networkDialogModel.getGateway().setIsAvailable((Boolean) returnValue); + } + })); + networkDialogModel.getName().setIsAvailable(false); networkDialogModel.getBondingOptions().setIsAvailable(false); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java index 8bf84f7..89150d5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInterfacePopupView.java @@ -237,8 +237,6 @@ isToSync.setVisible(false); isToSyncInfo.setVisible(false); - - gateway.setVisible(false); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java index 61ae719..4157abe 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/SetupNetworksInterfacePopupView.java @@ -30,8 +30,6 @@ bondingModeEditor.setVisible(false); commitChanges.setVisible(false); - gateway.setVisible(true); - isToSync.setVisible(true); if (object.getIsToSync().getIsChangable()){ isToSyncInfo.setVisible(true); -- To view, visit http://gerrit.ovirt.org/19582 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic31614a9a86e68a0840331f63ec2ac711ab8ac5f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
