Libor Spevak has uploaded a new change for review. Change subject: webadmin: Console button in Hosts tab enabled ......................................................................
webadmin: Console button in Hosts tab enabled VM lifecycle + console actions as in VM tab for Hosts/VM subtab enabled. Change-Id: Ic18079c7d578ee6caf5f72c0882a606da515748f Bug-Url: https://bugzilla.redhat.com/772442 Signed-off-by: Libor Spevak <lspe...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java 1 file changed, 39 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/10303/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java index 1046ef1..3890845 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java @@ -7,15 +7,19 @@ import org.ovirt.engine.core.common.businessentities.VMStatus; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider; +import org.ovirt.engine.ui.common.widget.action.CommandLocation; 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.hosts.HostListModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostVmListModel; +import org.ovirt.engine.ui.uicommonweb.models.vms.ConsoleModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; +import org.ovirt.engine.ui.webadmin.ApplicationResources; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.host.SubTabHostVmPresenter; import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; +import org.ovirt.engine.ui.webadmin.widget.action.WebAdminImageButtonDefinition; import org.ovirt.engine.ui.webadmin.widget.table.column.PercentColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.UptimeColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmStatusColumn; @@ -31,14 +35,15 @@ } @Inject - public SubTabHostVmView(SearchableDetailModelProvider<VM, HostListModel, HostVmListModel> modelProvider, ApplicationConstants constants) { + public SubTabHostVmView(SearchableDetailModelProvider<VM, HostListModel, HostVmListModel> modelProvider, + ApplicationResources resources, ApplicationConstants constants) { super(modelProvider); ViewIdHandler.idHandler.generateAndSetIds(this); - initTable(constants); + initTable(resources, constants); initWidget(getTable()); } - void initTable(ApplicationConstants constants) { + void initTable(ApplicationResources resources, ApplicationConstants constants) { getTable().addColumn(new VmStatusColumn(), constants.empty(), "30px"); //$NON-NLS-1$ TextColumnWithTooltip<VM> nameColumn = new TextColumnWithTooltip<VM>() { @@ -107,26 +112,54 @@ }; getTable().addColumn(hostColumn, constants.uptimeVm()); - getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.suspendVm()) { + // add action buttons + getTable().addActionButton(new WebAdminImageButtonDefinition<VM>(constants.suspendVm(), + resources.pauseVmImage(), resources.pauseVmDisabledImage()) { @Override protected UICommand resolveCommand() { return getDetailModel().getPauseCommand(); } }); - getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.shutDownVm()) { + + getTable().addActionButton(new WebAdminImageButtonDefinition<VM>(constants.shutDownVm(), + resources.stopVmImage(), resources.stopVmDisabledImage()) { @Override protected UICommand resolveCommand() { return getDetailModel().getShutdownCommand(); } }); - // getTable().addActionButton(new WebAdminButtonDefinition<VM>(getListModel().getStopCommand(), "Stop")); + + getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.powerOffVm(), CommandLocation.OnlyFromFromContext) { + @Override + protected UICommand resolveCommand() { + return getDetailModel().getStopCommand(); + } + }); + + getTable().addActionButton(new WebAdminImageButtonDefinition<VM>(constants.consoleVm(), + resources.consoleImage(), resources.consoleDisabledImage()) { + @Override + protected UICommand resolveCommand() { + ConsoleModel defaultConsoleModel = getDetailModel().getDefaultConsoleModel(); + return defaultConsoleModel != null ? defaultConsoleModel.getConnectCommand() : null; + } + }); + // TODO: separator + getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.migrateVm()) { @Override protected UICommand resolveCommand() { return getDetailModel().getMigrateCommand(); } }); + + getTable().addActionButton(new WebAdminButtonDefinition<VM>(constants.cancelMigrationVm()) { + @Override + protected UICommand resolveCommand() { + return getDetailModel().getCancelMigrateCommand(); + } + }); } } -- To view, visit http://gerrit.ovirt.org/10303 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic18079c7d578ee6caf5f72c0882a606da515748f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Libor Spevak <lspe...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
