Lior Vernia has uploaded a new change for review. Change subject: webadmin: Render Networks main tab columns sortable ......................................................................
webadmin: Render Networks main tab columns sortable Rendered all columns sortable except for: * Comment isn't helpful when it's displayed as icon. * Role and Provider, don't currently support server-side sorting. Change-Id: I440ad9be062547cdf4b1bad68d8f4d62072b5bef Bug-Url: https://bugzilla.redhat.com/1120054 Signed-off-by: Lior Vernia <[email protected]> --- M backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java 3 files changed, 22 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/30150/1 diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java index 1aafe5f..9dedf73 100644 --- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java +++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NetworkConditionFieldAutoCompleter.java @@ -2,15 +2,15 @@ public class NetworkConditionFieldAutoCompleter extends BaseConditionFieldAutoCompleter { - private static final String NAME = "NAME"; - private static final String DESCRIPTION = "DESCRIPTION"; - private static final String COMMENT = "COMMENT"; - private static final String VLAN_ID = "VLANID"; - private static final String STP = "STP"; - private static final String MTU = "MTU"; - private static final String VM_NETWORK = "VMNETWORK"; - private static final String DATA_CENTER = "DATACENTER"; - private static final String LABEL = "LABEL"; + public static final String NAME = "NAME"; + public static final String DESCRIPTION = "DESCRIPTION"; + public static final String COMMENT = "COMMENT"; + public static final String VLAN_ID = "VLANID"; + public static final String STP = "STP"; + public static final String MTU = "MTU"; + public static final String VM_NETWORK = "VMNETWORK"; + public static final String DATA_CENTER = "DATACENTER"; + public static final String LABEL = "LABEL"; public NetworkConditionFieldAutoCompleter() { // Building the basic verbs dict. 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 c9c8727..a37b8c0 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 @@ -201,12 +201,18 @@ @Override protected void syncSearch() { - SearchParameters tempVar = new SearchParameters(getSearchString(), SearchType.Network, isCaseSensitiveSearch()); + SearchParameters tempVar = + new SearchParameters(applySortOptions(getSearchString()), SearchType.Network, isCaseSensitiveSearch()); tempVar.setMaxCount(getSearchPageSize()); super.syncSearch(VdcQueryType.Search, tempVar); } @Override + public boolean supportsServerSideSorting() { + return true; + } + + @Override protected void onSelectedItemChanged() { super.onSelectedItemChanged(); updateActionAvailability(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java index ffc9b61..46e3d8b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java @@ -7,6 +7,7 @@ import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.core.common.queries.ConfigurationValues; +import org.ovirt.engine.core.searchbackend.NetworkConditionFieldAutoCompleter; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; import org.ovirt.engine.ui.common.widget.table.column.LinkColumnWithTooltip; @@ -70,6 +71,7 @@ return object.getName(); } }; + nameColumn.makeSortable(NetworkConditionFieldAutoCompleter.NAME); getTable().addColumn(nameColumn, constants.nameNetwork(), "200px"); //$NON-NLS-1$ @@ -82,6 +84,7 @@ return object.getDataCenterName(); } }; + dcColumn.makeSortable(NetworkConditionFieldAutoCompleter.DATA_CENTER); getTable().addColumn(dcColumn, constants.dcNetwork(), "200px"); //$NON-NLS-1$ @@ -91,6 +94,7 @@ return object.getDescription(); } }; + descriptionColumn.makeSortable(NetworkConditionFieldAutoCompleter.DESCRIPTION); getTable().addColumn(descriptionColumn, constants.descriptionNetwork(), "300px"); //$NON-NLS-1$ SafeHtmlWithSafeHtmlTooltipColumn<NetworkView> roleColumn = @@ -141,6 +145,7 @@ return object.getVlanId() == null ? "-" : object.getVlanId().toString(); //$NON-NLS-1$ } }; + vlanColumn.makeSortable(NetworkConditionFieldAutoCompleter.VLAN_ID); getTable().addColumn(vlanColumn, constants.vlanNetwork(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<NetworkView> labelColumn = new TextColumnWithTooltip<NetworkView>() { @@ -149,6 +154,7 @@ return object.getLabel() == null ? "-" : object.getLabel(); //$NON-NLS-1$ } }; + labelColumn.makeSortable(NetworkConditionFieldAutoCompleter.LABEL); getTable().addColumn(labelColumn, constants.networkLabelNetworksTab(), "200px"); //$NON-NLS-1$ providerColumn = new LinkColumnWithTooltip<NetworkView>() { -- To view, visit http://gerrit.ovirt.org/30150 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I440ad9be062547cdf4b1bad68d8f4d62072b5bef Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
