Alona Kaplan has uploaded a new change for review. Change subject: webadmin: Appending maintenance reason image to vds status column ......................................................................
webadmin: Appending maintenance reason image to vds status column Host main tab- a comment image will be appended to the status column if 'maintenance reason' is set. Change-Id: Ic025eafe06c230c698a569f1ddc66fbd9e029935 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java 1 file changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/38302/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java index 0b3bf5c..f8ff7d7 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabHostView.java @@ -1,5 +1,7 @@ package org.ovirt.engine.ui.webadmin.section.main.view.tab; +import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedList; import java.util.List; @@ -13,7 +15,10 @@ import org.ovirt.engine.ui.common.widget.action.ActionButtonDefinition; import org.ovirt.engine.ui.common.widget.action.CommandLocation; import org.ovirt.engine.ui.common.widget.table.SimpleActionTable; +import org.ovirt.engine.ui.common.widget.table.cell.CellWithElementId; +import org.ovirt.engine.ui.common.widget.table.cell.StatusCompositeCellWithElementId; import org.ovirt.engine.ui.common.widget.table.column.AbstractEnumColumn; +import org.ovirt.engine.ui.common.widget.table.column.AbstractSortableColumnWithElementId; import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumnWithTooltip; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.INewAsyncCallback; @@ -31,11 +36,13 @@ import org.ovirt.engine.ui.webadmin.uicommon.ReportActionsHelper; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminMenuBarButtonDefinition; +import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractPercentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.CommentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.HostStatusColumn; -import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractPercentColumn; +import org.ovirt.engine.ui.webadmin.widget.table.column.ReasonColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmCountColumn; +import com.google.gwt.cell.client.HasCell; import com.google.gwt.core.client.GWT; import com.google.inject.Inject; @@ -143,8 +150,23 @@ return object.getStatus(); } }; - statusColumn.makeSortable(VdsConditionFieldAutoCompleter.STATUS); - getTable().addColumn(statusColumn, constants.statusHost(), "100px"); //$NON-NLS-1$ + + ReasonColumn<VDS> reasonColumn = new ReasonColumn<VDS>(); + + CellWithElementId<VDS> compositeCell = new StatusCompositeCellWithElementId( + new ArrayList<HasCell<VDS, ?>>(Arrays.asList( + statusColumn, + reasonColumn))); + + AbstractSortableColumnWithElementId<VDS, VDS> statusTextColumn = + new AbstractSortableColumnWithElementId<VDS, VDS>(compositeCell) { + @Override + public VDS getValue(VDS object) { + return object; + } + }; + statusTextColumn.makeSortable(VdsConditionFieldAutoCompleter.STATUS); + getTable().addColumn(statusTextColumn, constants.statusHost(), "100px"); //$NON-NLS-1$ if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { VmCountColumn vmCountColumn = new VmCountColumn(); -- To view, visit https://gerrit.ovirt.org/38302 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic025eafe06c230c698a569f1ddc66fbd9e029935 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
