Daniel Erez has uploaded a new change for review. Change subject: webadmin: select last snapshot by default (#851094) ......................................................................
webadmin: select last snapshot by default (#851094) VMs main-tab -> Snapshots sub-tab: select the last (below 'Active VM') snapshot by default. Change-Id: Id09884a06615ecd2c1fdf7128f7af684a7e70a7d Bug-Url: https://bugzilla.redhat.com/851094 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java 3 files changed, 44 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/60/8260/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java index 451d3ea..27ab4df 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotInfoPanel.java @@ -32,7 +32,7 @@ import com.google.gwt.dom.client.Style.Position; import com.google.gwt.dom.client.Style.Unit; -import com.google.gwt.user.client.ui.SimplePanel; +import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.TabLayoutPanel; import com.google.gwt.view.client.NoSelectionModel; @@ -69,10 +69,10 @@ initAppsTable(); // Add Tabs - add(new SimplePanel(generalForm), constants.generalLabel()); - add(new SimplePanel(disksTable), constants.disksLabel()); - add(new SimplePanel(nicsTable), constants.nicsLabel()); - add(new SimplePanel(appsTable), constants.applicationsLabel()); + add(new ScrollPanel(generalForm), constants.generalLabel()); + add(new ScrollPanel(disksTable), constants.disksLabel()); + add(new ScrollPanel(nicsTable), constants.nicsLabel()); + add(new ScrollPanel(appsTable), constants.applicationsLabel()); // Add selection listener vmSnapshotListModel.getSelectedItemChangedEvent().addListener(new IEventListener() { @@ -80,7 +80,7 @@ @Override public void eventRaised(Event ev, Object sender, EventArgs args) { Snapshot snapshot = (Snapshot) vmSnapshotListModel.getSelectedItem(); - updatePanel(snapshot); + // updatePanel(snapshot); } }); } @@ -123,13 +123,13 @@ disksTable.addColumn(new DiskImageStatusColumn(), constants.empty(), "30px"); //$NON-NLS-1$ - TextColumnWithTooltip<DiskImage> nameColumn = new TextColumnWithTooltip<DiskImage>() { + TextColumnWithTooltip<DiskImage> aliasColumn = new TextColumnWithTooltip<DiskImage>() { @Override public String getValue(DiskImage object) { return object.getDiskAlias(); } }; - disksTable.addColumn(nameColumn, constants.nameDisk()); + disksTable.addColumn(aliasColumn, constants.aliasDisk()); DiskSizeColumn<DiskImage> sizeColumn = new DiskSizeColumn<DiskImage>() { @Override @@ -153,7 +153,7 @@ return VolumeType.forValue(object.getvolume_type().getValue()); } }; - disksTable.addColumn(allocationColumn, constants.allocationDisk(), "80px"); //$NON-NLS-1$ + disksTable.addColumn(allocationColumn, constants.allocationDisk(), "60px"); //$NON-NLS-1$ TextColumnWithTooltip<DiskImage> interfaceColumn = new TextColumnWithTooltip<DiskImage>() { @Override @@ -177,7 +177,15 @@ return object.getcreation_date(); } }; - disksTable.addColumn(dateCreatedColumn, constants.creationDateDisk(), "140px"); //$NON-NLS-1$ + disksTable.addColumn(dateCreatedColumn, constants.creationDateDisk(), "80px"); //$NON-NLS-1$ + + TextColumnWithTooltip<DiskImage> descriptionColumn = new TextColumnWithTooltip<DiskImage>() { + @Override + public String getValue(DiskImage object) { + return object.getDiskDescription(); + } + }; + disksTable.addColumn(descriptionColumn, constants.descriptionDisk()); disksTable.setRowData(new ArrayList<EntityModel>()); disksTable.setWidth("100%", true); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.java index 8801b2e..61f33c8 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListModelTable.java @@ -5,6 +5,9 @@ import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotStatus; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; import org.ovirt.engine.core.common.queries.CommandVersionsInfo; +import org.ovirt.engine.core.compat.Event; +import org.ovirt.engine.core.compat.EventArgs; +import org.ovirt.engine.core.compat.IEventListener; import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.CommonApplicationTemplates; @@ -50,6 +53,8 @@ CommonApplicationConstants constants; CommonApplicationTemplates templates; + VmSnapshotInfoPanel vmSnapshotInfoPanel; + public VmSnapshotListModelTable(DataBoundTabModelProvider<Snapshot, L> modelProvider, EventBus eventBus, ClientStorage clientStorage, CommonApplicationConstants constants, CommonApplicationTemplates templates) { @@ -63,8 +68,7 @@ snapshotsTableContainer.add(table); // Create Snapshot information tab panel - VmSnapshotInfoPanel vmSnapshotInfoPanel = - new VmSnapshotInfoPanel((VmSnapshotListModel) getModel(), constants, templates); + vmSnapshotInfoPanel = new VmSnapshotInfoPanel((VmSnapshotListModel) getModel(), constants, templates); snapshotInfoContainer.add(vmSnapshotInfoPanel); } @@ -123,6 +127,18 @@ initActionButtons(constants); disableActiveSnapshotRow(); + + // Add selection listener + getModel().getSelectedItemChangedEvent().addListener(new IEventListener() { + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + Snapshot snapshot = (Snapshot) getModel().getSelectedItem(); + if (snapshot != null && !getTable().getSelectionModel().isSelected(snapshot)) { + getTable().getSelectionModel().setSelected(snapshot, true); + } + vmSnapshotInfoPanel.updatePanel(snapshot); + } + }); } private void initActionButtons(final CommonApplicationConstants constants) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java index 2e62664..813e414 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java @@ -207,6 +207,8 @@ } } + private boolean isEntityChanged; + public VmSnapshotListModel() { setTitle(ConstantsManager.getInstance().getConstants().snapshotsTitle()); @@ -280,6 +282,11 @@ super.setItems(sortedSnapshots); + if (isEntityChanged && sortedSnapshots.size() > 1) { + setSelectedItem(sortedSnapshots.get(1)); + } + isEntityChanged = false; + UpdateActionAvailability(); } @@ -298,6 +305,7 @@ if (getEntity() != null) { + isEntityChanged = true; getSearchCommand().Execute(); } } -- To view, visit http://gerrit.ovirt.org/8260 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id09884a06615ecd2c1fdf7128f7af684a7e70a7d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
