Alona Kaplan has uploaded a new change for review. Change subject: engine,webadmin: Networks sort should be done on engine side ......................................................................
engine,webadmin: Networks sort should be done on engine side Networks main tab should be sorted in the following way- Primary sort- data center name Secondary sort- network name The sort was done on the webadmin side. It caused a bug, cause if the search string included "sort by" it was ignored (the webadmin sorted all the items ignoring the search string). Change-Id: Ic9735606231e1947e76bd5550cbcc6566ac8a968 Signed-off-by: Alona Kaplan <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java 2 files changed, 1 insertion(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/21/10521/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java index fd499b6..460039c 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SearchObjectAutoCompleter.java @@ -253,7 +253,7 @@ "network_view", "network_view", "id", - "name ASC")); + "storage_pool_name ASC, name ASC")); put(SearchObjects.VDS_NETWORK_INTERFACE_OBJ_NAME, new EntitySearchInfo(null, new NetworkInterfaceConditionFieldAutoCompleter(), "vds_interface", diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java index 769052b..6bf3d16 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java @@ -1,8 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; import java.util.List; import org.ovirt.engine.core.common.businessentities.Network; @@ -245,27 +243,6 @@ private void OnSystemTreeSelectedItemChanged() { UpdateActionAvailability(); - } - - @Override - public void setItems(Iterable value) { - if (value != null) { - List<NetworkView> networksList = (List<NetworkView>) value; - Collections.sort(networksList, new Comparator<NetworkView>() { - - @Override - public int compare(NetworkView paramT1, NetworkView paramT2) { - int compareValue = paramT1.getStoragePoolName().compareTo(paramT2.getStoragePoolName()); - - if (compareValue != 0) { - return compareValue; - } - - return paramT1.getName().compareTo(paramT2.getName()); - } - }); - } - super.setItems(value); } @Override -- To view, visit http://gerrit.ovirt.org/10521 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic9735606231e1947e76bd5550cbcc6566ac8a968 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
