Mike Kolesnik has uploaded a new change for review. Change subject: webadmin: Add gateway & DNS servers columns ......................................................................
webadmin: Add gateway & DNS servers columns Added the columns to the external subnet sub-tab under a network, in order to reflect to the user what are the current settings of these fields. Change-Id: I794ee197f31ef89f51f27074d5a8f2a1ca5e51d6 Bug-Url: https://bugzilla.redhat.com/1064749 Signed-off-by: Mike Kolesnik <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkExternalSubnetView.java 1 file changed, 26 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/25360/1 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 01eff55..52157cd 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 @@ -1,14 +1,15 @@ package org.ovirt.engine.ui.webadmin.section.main.view.tab.network; -import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.core.common.businessentities.network.ExternalSubnet; import org.ovirt.engine.core.common.businessentities.network.ExternalSubnet.IpVersion; +import org.ovirt.engine.core.common.businessentities.network.NetworkView; import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider; import org.ovirt.engine.ui.common.widget.table.column.EnumColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.UICommand; -import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkListModel; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkExternalSubnetListModel; +import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkListModel; +import org.ovirt.engine.ui.uicompat.external.StringUtils; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.network.SubTabNetworkExternalSubnetPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView; @@ -37,7 +38,7 @@ return object.getName(); } }; - getTable().addColumn(nameColumn, constants.nameExternalSubnet(), "300px"); //$NON-NLS-1$ + getTable().addColumn(nameColumn, constants.nameExternalSubnet(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> cidrColumn = new TextColumnWithTooltip<ExternalSubnet>() { @@ -46,7 +47,7 @@ return object.getCidr(); } }; - getTable().addColumn(cidrColumn, constants.cidrExternalSubnet(), "200px"); //$NON-NLS-1$ + getTable().addColumn(cidrColumn, constants.cidrExternalSubnet(), "100px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> ipVersionColumn = new EnumColumn<ExternalSubnet, IpVersion>() { @@ -55,7 +56,27 @@ return object.getIpVersion(); } }; - getTable().addColumn(ipVersionColumn, constants.ipVersionExternalSubnet(), "100px"); //$NON-NLS-1$ + getTable().addColumn(ipVersionColumn, constants.ipVersionExternalSubnet(), "80px"); //$NON-NLS-1$ + + TextColumnWithTooltip<ExternalSubnet> gatewayColumn = + new TextColumnWithTooltip<ExternalSubnet>() { + @Override + public String getValue(ExternalSubnet object) { + return object.getGateway(); + } + }; + + getTable().addColumn(gatewayColumn, constants.gatewayExternalSubnet(), "100px"); //$NON-NLS-1$ + + TextColumnWithTooltip<ExternalSubnet> dnsServersColumn = + new TextColumnWithTooltip<ExternalSubnet>() { + @Override + public String getValue(ExternalSubnet object) { + return StringUtils.join(object.getDnsServers(), ", "); //$NON-NLS-1$ + } + }; + + getTable().addColumn(dnsServersColumn, constants.dnsServersExternalSubnet(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<ExternalSubnet> externalIdColumn = new TextColumnWithTooltip<ExternalSubnet>() { -- To view, visit http://gerrit.ovirt.org/25360 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I794ee197f31ef89f51f27074d5a8f2a1ca5e51d6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
