Arik Hadas has uploaded a new change for review. Change subject: webadmin: change how warning on imported vm is stored ......................................................................
webadmin: change how warning on imported vm is stored We used to store warnings that are related to VMs to be imported in a dedicated list. Instead, we'll now store it per-VM in its ImportVmData instance. Change-Id: I3b636821f264b63d6ad0b8c9fd7592cb6e10d41c Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java D frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java 5 files changed, 25 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/39878/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java index d936d89..d02443e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplateModel.java @@ -43,7 +43,6 @@ super(vmImportDiskListModel, storageDomain, cluster, clusterQuota, null, vmImportInterfaceListModel, vmImportAppListModel); this.templateImportDiskListModel = templateImportDiskListModel; - disksToConvert = null; setDetailList(templateGeneralModel, templateImportInterfaceListModel); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java index 16e5492..7b92f37 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmData.java @@ -12,6 +12,7 @@ private boolean templateExistsInSetup = true; private EntityModel<Boolean> collapseSnapshots; + private String problem; public ImportVmData(VM vm) { setCollapseSnapshots(new EntityModel<>(true)); @@ -71,4 +72,12 @@ public String getName() { return getEntity().getName(); } + + public String getProblem() { + return problem; + } + + public void setProblem(String problem) { + this.problem = problem; + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java index d70d201..a081286 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExportDomainModel.java @@ -120,12 +120,6 @@ return clusterQuota; } - protected List<VM> disksToConvert = new ArrayList<>(); - - public List<VM> getDisksToConvert() { - return disksToConvert; - } - private UICommand closeCommand; public void setCloseCommand(UICommand closeCommand) { @@ -363,7 +357,8 @@ && getDiskImportData(disk.getId()) != null && (getDiskImportData(disk.getId()).getSelectedStorageDomain() .getStorageType().isBlockDomain())) { - getDisksToConvert().add(vm); + ((ImportVmData) item).setProblem(ConstantsManager.getInstance().getConstants() + .importSparseDiskToBlockDeviceMustCollapseSnapshots()); ((ImportVmData) item).getCollapseSnapshots().setEntity(true); ((ImportVmData) item).getCollapseSnapshots() .setChangeProhibitionReason(ConstantsManager.getInstance() diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java index 63a7684..aae507b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java @@ -47,7 +47,6 @@ import org.ovirt.engine.ui.webadmin.gin.AssetProvider; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.storage.backup.ImportVmFromExportDomainPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.widget.table.cell.CustomSelectionCell; -import org.ovirt.engine.ui.webadmin.widget.table.column.IsProblematicImportVmColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmTypeColumn; import com.google.gwt.cell.client.FieldUpdater; @@ -237,6 +236,20 @@ protected void initMainTable() { this.table = new ListModelObjectCellTable<>(); + + AbstractImageResourceColumn<Object> isProblematicImportVmColumn = new AbstractImageResourceColumn<Object>() { + @Override + public ImageResource getValue(Object object) { + return ((ImportVmData) object).getProblem() != null ? resources.alertImage() : null; + } + + @Override + public SafeHtml getTooltip(Object object) { + String problem = ((ImportVmData) object).getProblem(); + return problem != null ? SafeHtmlUtils.fromSafeConstant(problem) : null; + } + }; + table.addColumn(isProblematicImportVmColumn, constants.empty(), "20px"); //$NON-NLS-1$ AbstractTextColumn<Object> nameColumn = new AbstractTextColumn<Object>() { @Override @@ -651,12 +664,6 @@ @Override public void edit(final ImportVmFromExportDomainModel object) { this.importModel = object; - table.asEditor().edit(object); - - if (object.getDisksToConvert() != null) { - table.addColumnAt(new IsProblematicImportVmColumn(object.getDisksToConvert()), "", "30px", 0); //$NON-NLS-1$ //$NON-NLS-2$ - } - table.asEditor().edit(object); addStorageDomainsColumn(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java deleted file mode 100644 index be9ba88..0000000 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/IsProblematicImportVmColumn.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ovirt.engine.ui.webadmin.widget.table.column; - -import java.util.List; - -import org.ovirt.engine.core.common.businessentities.VM; -import org.ovirt.engine.ui.common.widget.table.column.AbstractImageResourceColumn; -import org.ovirt.engine.ui.webadmin.ApplicationResources; -import org.ovirt.engine.ui.webadmin.gin.AssetProvider; - -import com.google.gwt.resources.client.ImageResource; - -/** - * Image column that corresponds to XAML {@code PermissionTypeDataTemplate}. - */ -public class IsProblematicImportVmColumn extends AbstractImageResourceColumn<Object> { - - private final static ApplicationResources resources = AssetProvider.getResources(); - - private final List<VM> problematicItems; - - public IsProblematicImportVmColumn(List<VM> problematicItems) { - this.problematicItems = problematicItems; - } - - @Override - public ImageResource getValue(Object vm) { - if (problematicItems.contains(vm)) { - return resources.alertImage(); - } - return null; - } - -} -- To view, visit https://gerrit.ovirt.org/39878 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b636821f264b63d6ad0b8c9fd7592cb6e10d41c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
