Alona Kaplan has uploaded a new change for review. Change subject: webadmin: remove "all" filter from Network Host sub tab ......................................................................
webadmin: remove "all" filter from Network Host sub tab The all radio button in the Network Host sub tab is useless. If the user wants to see all the hosts in the cluster he can go to hosts main tab. This patch removes "all" radio button from the view. Change-Id: I1cfb2f570c5c485da8f9d78f57e2484534934e11 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java 4 files changed, 4 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/68/10368/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java index 9e279dd..68e0577 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java @@ -4,7 +4,6 @@ import org.ovirt.engine.ui.uicompat.ConstantsManager; public enum NetworkHostFilter implements ViewFilter<NetworkHostFilter>{ - all(ConstantsManager.getInstance().getConstants().allHost()), attached(ConstantsManager.getInstance().getConstants().attachedHost()), unattached(ConstantsManager.getInstance().getConstants().unattachedHost()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java index 346e5b8..a648083 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java @@ -6,7 +6,6 @@ import org.ovirt.engine.core.common.businessentities.NetworkView; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VdsNetworkInterface; -import org.ovirt.engine.core.common.queries.GetAllVdsByStoragePoolParameters; import org.ovirt.engine.core.common.queries.NetworkIdParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; @@ -87,10 +86,6 @@ Frontend.RunQuery(VdcQueryType.GetVdsWithoutNetwork, networkIdParams, asyncQuery); } else if (NetworkHostFilter.attached.equals(getViewFilterType())) { Frontend.RunQuery(VdcQueryType.GetVdsAndNetworkInterfacesByNetworkId, networkIdParams, asyncQuery); - } else if (NetworkHostFilter.all.equals(getViewFilterType())) { - Frontend.RunQuery(VdcQueryType.GetAllVdsByStoragePool, - new GetAllVdsByStoragePoolParameters(getEntity().getstorage_pool_id().getValue()), - asyncQuery); } setIsQueryFirstTime(false); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index 9004289..b404ffa 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -1624,9 +1624,6 @@ @DefaultStringValue("Attached") String attachedHost(); - @DefaultStringValue("All") - String allHost(); - @DefaultStringValue("Unattached") String unattachedHost(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java index ab7c2fa..f845e13 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java @@ -160,14 +160,12 @@ private void handleRadioButtonClick(ClickEvent event) { getDetailModel().setViewFilterType((viewRadioGroup.getSelectedValue())); - boolean all = viewRadioGroup.getSelectedValue() == NetworkHostFilter.all; boolean attached = viewRadioGroup.getSelectedValue() == NetworkHostFilter.attached; - boolean unattached = viewRadioGroup.getSelectedValue() == NetworkHostFilter.unattached; - getTable().ensureColumnPresent(hostStatus, constants.empty(), all || attached || unattached, "30px"); //$NON-NLS-1$ - getTable().ensureColumnPresent(nameColumn, constants.nameHost(), all || attached || unattached); - getTable().ensureColumnPresent(clusterColumn, constants.clusterHost(), all || attached || unattached); - getTable().ensureColumnPresent(dcColumn, constants.dcHost(), all || attached || unattached); + getTable().ensureColumnPresent(hostStatus, constants.empty(), true, "30px"); //$NON-NLS-1$ + getTable().ensureColumnPresent(nameColumn, constants.nameHost(), true); + getTable().ensureColumnPresent(clusterColumn, constants.clusterHost(), true); + getTable().ensureColumnPresent(dcColumn, constants.dcHost(), true); getTable().ensureColumnPresent(nicStatusColumn, constants.statusNetworkHost(), attached, "140px"); //$NON-NLS-1$ getTable().ensureColumnPresent(nicColumn, constants.nicNetworkHost(), attached); getTable().ensureColumnPresent(speedColumn, constants.speedNetworkHost(), attached); -- To view, visit http://gerrit.ovirt.org/10368 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1cfb2f570c5c485da8f9d78f57e2484534934e11 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
