Lior Vernia has uploaded a new change for review. Change subject: webadmin: Render Networks subtab columns sortable ......................................................................
webadmin: Render Networks subtab columns sortable Turned on default text column sorting for all relevant subtab columns under the networks main tab. Change-Id: I0e95f529114e62536de0a4f13e8acb20eb6e651d Bug-Url: https://bugzilla.redhat.com/1120054 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkExternalSubnetView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java 8 files changed, 44 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/30152/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java index 665fb12..58cfac7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionListModelTable.java @@ -33,6 +33,7 @@ return object.getOwnerName(); } }; + userColumn.makeSortable(); getTable().addColumn(userColumn, constants.userPermission(), "300px"); //$NON-NLS-1$ TextColumnWithTooltip<Permissions> roleColumn = new TextColumnWithTooltip<Permissions>() { @@ -41,6 +42,7 @@ return object.getRoleName(); } }; + roleColumn.makeSortable(); getTable().addColumn(roleColumn, constants.rolePermission(), "300px"); //$NON-NLS-1$ getTable().addActionButton(new UiCommandButtonDefinition<Permissions>(getEventBus(), constants.addPermission()) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java index 373fa77..297b7a0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/permissions/PermissionWithInheritedPermissionListModelTable.java @@ -30,6 +30,7 @@ }; } }; + permissionColumn.makeSortable(); getTable().addColumn(permissionColumn, constants.inheritedPermission(), "300px"); //$NON-NLS-1$ } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java index f365fd1..e42d672 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java @@ -64,6 +64,7 @@ return object.getFirst().getName(); } }; + nameColumn.makeSortable(); getTable().addColumn(nameColumn, constants.nameCluster(), "400px"); //$NON-NLS-1$ TextColumnWithTooltip<PairQueryable<VDSGroup, NetworkCluster>> versionColumn = new TextColumnWithTooltip<PairQueryable<VDSGroup, NetworkCluster>>() { @@ -72,6 +73,7 @@ return object.getFirst().getcompatibility_version().getValue(); } }; + versionColumn.makeSortable(); getTable().addColumn(versionColumn, constants.comptVersCluster(), "130px"); //$NON-NLS-1$ CheckboxColumn<PairQueryable<VDSGroup, NetworkCluster>> attachedColumn = @@ -151,13 +153,14 @@ getTable().addColumn(netRoleColumn, constants.roleNetCluster(), "120px"); //$NON-NLS-1$ - TextColumnWithTooltip<PairQueryable<VDSGroup, NetworkCluster>> dsecriptionColumn = new TextColumnWithTooltip<PairQueryable<VDSGroup, NetworkCluster>>() { + TextColumnWithTooltip<PairQueryable<VDSGroup, NetworkCluster>> descriptionColumn = new TextColumnWithTooltip<PairQueryable<VDSGroup, NetworkCluster>>() { @Override public String getValue(PairQueryable<VDSGroup, NetworkCluster> object) { return object.getFirst().getdescription(); } }; - getTable().addColumn(dsecriptionColumn, constants.descriptionCluster(), "400px"); //$NON-NLS-1$ + descriptionColumn.makeSortable(); + getTable().addColumn(descriptionColumn, constants.descriptionCluster(), "400px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<PairQueryable<VDSGroup, NetworkCluster>>(constants.assignUnassignNetwork()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkExternalSubnetView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkExternalSubnetView.java index 52157cd..578fd0f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkExternalSubnetView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkExternalSubnetView.java @@ -38,6 +38,7 @@ return object.getName(); } }; + nameColumn.makeSortable(); getTable().addColumn(nameColumn, constants.nameExternalSubnet(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> cidrColumn = @@ -47,6 +48,7 @@ return object.getCidr(); } }; + cidrColumn.makeSortable(); getTable().addColumn(cidrColumn, constants.cidrExternalSubnet(), "100px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> ipVersionColumn = @@ -56,6 +58,7 @@ return object.getIpVersion(); } }; + ipVersionColumn.makeSortable(); getTable().addColumn(ipVersionColumn, constants.ipVersionExternalSubnet(), "80px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> gatewayColumn = @@ -65,7 +68,7 @@ return object.getGateway(); } }; - + gatewayColumn.makeSortable(); getTable().addColumn(gatewayColumn, constants.gatewayExternalSubnet(), "100px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> dnsServersColumn = @@ -75,7 +78,7 @@ return StringUtils.join(object.getDnsServers(), ", "); //$NON-NLS-1$ } }; - + dnsServersColumn.makeSortable(); getTable().addColumn(dnsServersColumn, constants.dnsServersExternalSubnet(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> externalIdColumn = @@ -85,7 +88,7 @@ return object.getId(); } }; - + externalIdColumn.makeSortable(); getTable().addColumn(externalIdColumn, constants.externalIdExternalSubnet(), "300px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<ExternalSubnet>(constants.newNetworkExternalSubnet()) { 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 ae4df6f..0baa75b 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 @@ -207,6 +207,7 @@ getTable().enableColumnResizing(); initTableOverhead(); handleRadioButtonClick(null); + initSorting(); getTable().addActionButton(new WebAdminButtonDefinition<PairQueryable<VdsNetworkInterface, VDS>>(constants.setupHostNetworksInterface()) { @Override @@ -215,5 +216,12 @@ } }); } + + private void initSorting() { + nameColumn.makeSortable(); + clusterColumn.makeSortable(); + dcColumn.makeSortable(); + speedColumn.makeSortable(); + } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java index 9a113b9..46b42a2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkProfileView.java @@ -36,6 +36,7 @@ return object.getName(); } }; + nameColumn.makeSortable(); getTable().addColumn(nameColumn, constants.nameVnicProfile(), "400px"); //$NON-NLS-1$ TextColumnWithTooltip<VnicProfileView> networkColumn = new TextColumnWithTooltip<VnicProfileView>() { @@ -44,6 +45,7 @@ return object.getNetworkName(); } }; + networkColumn.makeSortable(); getTable().addColumn(networkColumn, constants.networkVnicProfile(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<VnicProfileView> dcColumn = new TextColumnWithTooltip<VnicProfileView>() { @@ -52,6 +54,7 @@ return object.getDataCenterName(); } }; + dcColumn.makeSortable(); getTable().addColumn(dcColumn, constants.dcVnicProfile(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<VnicProfileView> compatibilityVersionColumn = @@ -61,13 +64,16 @@ return object.getCompatibilityVersion().toString(); } }; + compatibilityVersionColumn.makeSortable(); getTable().addColumn(compatibilityVersionColumn, constants.compatibilityVersionVnicProfile(), "200px"); //$NON-NLS-1$ + TextColumnWithTooltip<VnicProfileView> qosColumn = new TextColumnWithTooltip<VnicProfileView>() { @Override public String getValue(VnicProfileView object) { return object.getNetworkQosName(); } }; + qosColumn.makeSortable(); getTable().addColumn(qosColumn, constants.qosNameVnicProfile(), "200px"); //$NON-NLS-1$ BooleanColumn<VnicProfileView> portMirroringColumn = @@ -77,6 +83,7 @@ return object.isPortMirroring(); } }; + portMirroringColumn.makeSortable(); getTable().addColumnWithHtmlHeader(portMirroringColumn, constants.portMirroringVnicProfile(), "85px"); //$NON-NLS-1$ TextColumnWithTooltip<VnicProfileView> descriptionColumn = @@ -86,6 +93,7 @@ return object.getDescription(); } }; + descriptionColumn.makeSortable(); getTable().addColumn(descriptionColumn, constants.descriptionVnicProfile(), "400px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<VnicProfileView>(constants.newNetworkProfile()) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java index 7557d62..99d8302 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkTemplateView.java @@ -45,6 +45,7 @@ return object.getSecond().getName(); } }; + nameColumn.makeSortable(); getTable().addColumn(nameColumn, constants.nameTemplate(), "400px"); //$NON-NLS-1$ TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>> statusColumn = new EnumColumn<PairQueryable<VmNetworkInterface, VmTemplate>, VmTemplateStatus>() { @@ -53,6 +54,7 @@ return object.getSecond().getStatus(); } }; + statusColumn.makeSortable(); getTable().addColumn(statusColumn, constants.statusTemplate(), "100px"); //$NON-NLS-1$ TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>> clusterColumn = new TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>>() { @@ -61,6 +63,7 @@ return object.getSecond().getVdsGroupName(); } }; + clusterColumn.makeSortable(); getTable().addColumn(clusterColumn, constants.clusterTemplate(), "150px"); //$NON-NLS-1$ TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>> vnicNameColumn = new TextColumnWithTooltip<PairQueryable<VmNetworkInterface, VmTemplate>>() { @@ -69,6 +72,7 @@ return object.getFirst().getName(); } }; + vnicNameColumn.makeSortable(); getTable().addColumn(vnicNameColumn, constants.vnicNetworkTemplate(), "150px"); //$NON-NLS-1$ getTable().addActionButton(new WebAdminButtonDefinition<PairQueryable<VmNetworkInterface, VmTemplate>>(constants.removeInterface()) { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java index 5a10550..5df2cb6 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkVmView.java @@ -188,6 +188,7 @@ getTable().enableColumnResizing(); initTableOverhead(); handleRadioButtonClick(null); + initSorting(); getTable().addActionButton(new WebAdminButtonDefinition<PairQueryable<VmNetworkInterface, VM>>(constants.removeInterface()) { @Override @@ -198,5 +199,14 @@ } + private void initSorting() { + nameColumn.makeSortable(); + clusterColumn.makeSortable(); + ipColumn.makeSortable(); + fqdnColumn.makeSortable(); + vnicNameColumn.makeSortable(); + descriptionColumn.makeSortable(); + } + } -- To view, visit http://gerrit.ovirt.org/30152 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e95f529114e62536de0a4f13e8acb20eb6e651d 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
