Yevgeny Zaspitsky has uploaded a new change for review. Change subject: webadmin: add management role indication to the network-cluster sub-tab ......................................................................
webadmin: add management role indication to the network-cluster sub-tab Add management network role indication to the network-cluster sub-tab. Change-Id: I2e99610ca2e83e75e4d078e5dd785fd7d6104cec Signed-off-by: Yevgeny Zaspitsky <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkClusterView.java 1 file changed, 15 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/36911/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 76b50fc..8c2d330 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 @@ -48,6 +48,7 @@ private final SafeHtml displayImage; private final SafeHtml migrationImage; private final SafeHtml emptyImage; + private final SafeHtml managementImage; @Inject public SubTabNetworkClusterView(SearchableDetailModelProvider<PairQueryable<VDSGroup, NetworkCluster>, NetworkListModel, NetworkClusterListModel> modelProvider, ApplicationConstants constants, ApplicationTemplates templates, ApplicationResources resources) { @@ -59,6 +60,7 @@ migrationImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.migrationNetwork()).getHTML()); emptyImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.networkEmpty()).getHTML()); + managementImage = SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create(resources.mgmtNetwork()).getHTML()); initTable(); initWidget(getTable()); } @@ -105,7 +107,7 @@ getTable().addColumn(attachedColumn, constants.attachedNetworkCluster(), "120px"); //$NON-NLS-1$ NetworkClusterStatusColumn statusColumn = new NetworkClusterStatusColumn(); - statusColumn.makeSortable(new SimpleStatusColumnComparator<PairQueryable<VDSGroup, NetworkCluster>>(statusColumn)); + statusColumn.makeSortable(new SimpleStatusColumnComparator<>(statusColumn)); getTable().addColumn(statusColumn, constants.networkStatus(), "120px"); //$NON-NLS-1$ CheckboxColumn<PairQueryable<VDSGroup, NetworkCluster>> netRequiredColumn = @@ -131,7 +133,7 @@ @Override public SafeHtml getValue(PairQueryable<VDSGroup, NetworkCluster> object) { - List<SafeHtml> images = new LinkedList<SafeHtml>(); + List<SafeHtml> images = new LinkedList<>(); if (object.getSecond() != null) { if (object.getSecond().isDisplay()) { @@ -146,13 +148,19 @@ images.add(emptyImage); } + if (object.getSecond().isManagement()) { + images.add(managementImage); + } else { + images.add(emptyImage); + + } } return NetworkRoleColumnHelper.getValue(images); } @Override public SafeHtml getTooltip(PairQueryable<VDSGroup, NetworkCluster> object) { - Map<SafeHtml, String> imagesToText = new LinkedHashMap<SafeHtml, String>(); + Map<SafeHtml, String> imagesToText = new LinkedHashMap<>(); if (object.getSecond() != null) { if (object.getSecond().isDisplay()) { imagesToText.put(displayImage, constants.displayItemInfo()); @@ -161,6 +169,10 @@ if (object.getSecond().isMigration()) { imagesToText.put(migrationImage, constants.migrationItemInfo()); } + + if (object.getSecond().isManagement()) { + imagesToText.put(managementImage, constants.managementItemInfo()); + } } return NetworkRoleColumnHelper.getTooltip(imagesToText); -- To view, visit http://gerrit.ovirt.org/36911 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e99610ca2e83e75e4d078e5dd785fd7d6104cec Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
