Daniel Erez has uploaded a new change for review. Change subject: webadmin: storage quota in import VM from data SD dialog ......................................................................
webadmin: storage quota in import VM from data SD dialog Import VM/Template from data SD dialog: introduced storage quota column. Change-Id: I1bb85c0f5bee8a06c967a50e6309ff28c3ea3dfd Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterEntityModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterTemplateModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportEntityData.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplatePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java 10 files changed, 182 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/29/28729/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterEntityModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterEntityModel.java index ed2d8c9..537a48a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterEntityModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterEntityModel.java @@ -1,11 +1,14 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; +import org.ovirt.engine.core.common.businessentities.Disk; +import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; +import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.frontend.AsyncQuery; @@ -33,14 +36,20 @@ private ListModel<ImportEntityData> entities; private ListModel<VDSGroup> cluster; private EntityModel<Map<Guid, List<Quota>>> clusterQuotasMap; + private EntityModel<Map<Guid, Quota>> diskQuotaMap; + private ListModel<Quota> storageQuota; private Guid storageDomainId; private StoragePool storagePool; public RegisterEntityModel() { setEntities(new ListModel()); setCluster(new ListModel()); + setClusterQuotasMap(new EntityModel<Map<Guid, List<Quota>>>()); getClusterQuotasMap().setEntity(new HashMap<Guid, List<Quota>>()); + setDiskQuotaMap(new EntityModel<Map<Guid, Quota>>()); + getDiskQuotaMap().setEntity(new HashMap<Guid, Quota>()); + setStorageQuota(new ListModel()); } protected abstract void onSave(); @@ -84,6 +93,7 @@ getCluster().setSelectedItem(Linq.firstOrDefault(clusters)); updateClusterQuota(clusters); + updateStorageQuota(); } }), storagePool.getId(), true, false); @@ -91,7 +101,24 @@ }), storageDomainId); } - public void updateClusterQuota(ArrayList<VDSGroup> clusters) { + private void updateStorageQuota() { + if (!isQuotaEnabled()) { + return; + } + + Frontend.getInstance().runQuery(VdcQueryType.GetAllRelevantQuotasForStorage, + new IdQueryParameters(storageDomainId), new AsyncQuery(this, new INewAsyncCallback() { + @Override + public void onSuccess(Object innerModel, Object innerReturnValue) { + ArrayList<Quota> quotas = + (ArrayList<Quota>) ((VdcQueryReturnValue) innerReturnValue).getReturnValue(); + getStorageQuota().setItems(quotas); + getStorageQuota().setSelectedItem(Linq.firstOrDefault(quotas)); + } + })); + } + + private void updateClusterQuota(ArrayList<VDSGroup> clusters) { if (!isQuotaEnabled()) { return; } @@ -116,6 +143,46 @@ getClusterQuotasMap().setEntity(clusterQuotasMap); } }); + } + + public void selectQuotaByName(String name, ListModel<Quota> listModel) { + for (Quota quota : listModel.getItems()) { + if (quota.getQuotaName().equals(name)) { + listModel.setSelectedItem(quota); + break; + } + } + } + + public List<String> getQuotaNames(List<Quota> quotas) { + List<String> names = new ArrayList<String>(); + if (quotas != null) { + for (Quota quota : quotas) { + names.add(quota.getQuotaName()); + } + } + return names; + } + + public Quota getQuotaByName(String name, List<Quota> quotas) { + for (Quota quota : quotas) { + if (quota.getQuotaName().equals(name)) { + return quota; + } + } + return null; + } + + protected void updateDiskQuotas(List<Disk> disks) { + for (Disk disk : disks) { + Quota quota = getDiskQuotaMap().getEntity().get(disk.getId()); + if (quota == null) { + quota = getStorageQuota().getSelectedItem(); + } + if (quota != null) { + ((DiskImage) disk).setQuotaId(quota.getId()); + } + } } @Override @@ -172,6 +239,22 @@ this.clusterQuotasMap = clusterQuotasMap; } + public EntityModel<Map<Guid, Quota>> getDiskQuotaMap() { + return diskQuotaMap; + } + + public void setDiskQuotaMap(EntityModel<Map<Guid, Quota>> diskQuotaMap) { + this.diskQuotaMap = diskQuotaMap; + } + + public ListModel<Quota> getStorageQuota() { + return storageQuota; + } + + public void setStorageQuota(ListModel<Quota> storageQuota) { + this.storageQuota = storageQuota; + } + public boolean isQuotaEnabled() { return storagePool.getQuotaEnforcementType() != QuotaEnforcementTypeEnum.DISABLED; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterTemplateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterTemplateModel.java index d00eb05..a8630ec 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterTemplateModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterTemplateModel.java @@ -5,10 +5,10 @@ import org.ovirt.engine.core.common.action.ImportVmTemplateParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.BusinessEntity; +import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportEntityData; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; @@ -19,16 +19,21 @@ protected void onSave() { ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); for (ImportEntityData entityData : getEntities().getItems()) { - BusinessEntity<Guid> entity = (BusinessEntity<Guid>) entityData.getEntity(); + VmTemplate vmTemplate = (VmTemplate) entityData.getEntity(); VDSGroup vdsGroup = entityData.getCluster().getSelectedItem(); - Quota quota = isQuotaEnabled() ? entityData.getClusterQuota().getSelectedItem() : null; ImportVmTemplateParameters params = new ImportVmTemplateParameters(); - params.setContainerId(entity.getId()); + params.setContainerId(vmTemplate.getId()); params.setStorageDomainId(getStorageDomainId()); params.setImagesExistOnTargetStorageDomain(true); params.setVdsGroupId(vdsGroup != null ? vdsGroup.getId() : null); - params.setQuotaId(quota != null ? quota.getId() : null); + + if (isQuotaEnabled()) { + Quota quota = entityData.getClusterQuota().getSelectedItem(); + params.setQuotaId(quota != null ? quota.getId() : null); + params.setDiskTemplateMap(vmTemplate.getDiskTemplateMap()); + updateDiskQuotas(new ArrayList<Disk>(params.getDiskTemplateMap().values())); + } parameters.add(params); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java index feb2ce4..8f2b5d0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java @@ -3,10 +3,10 @@ import org.ovirt.engine.core.common.action.ImportVmParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.BusinessEntity; +import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportEntityData; import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; @@ -19,16 +19,21 @@ protected void onSave() { ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); for (ImportEntityData entityData : getEntities().getItems()) { - BusinessEntity<Guid> entity = (BusinessEntity<Guid>) entityData.getEntity(); + VM vm = (VM) entityData.getEntity(); VDSGroup vdsGroup = entityData.getCluster().getSelectedItem(); - Quota quota = isQuotaEnabled() ? entityData.getClusterQuota().getSelectedItem() : null; ImportVmParameters params = new ImportVmParameters(); - params.setContainerId(entity.getId()); + params.setContainerId(vm.getId()); params.setStorageDomainId(getStorageDomainId()); params.setImagesExistOnTargetStorageDomain(true); params.setVdsGroupId(vdsGroup != null ? vdsGroup.getId() : null); - params.setQuotaId(quota != null ? quota.getId() : null); + + if (isQuotaEnabled()) { + Quota quota = entityData.getClusterQuota().getSelectedItem(); + params.setQuotaId(quota != null ? quota.getId() : null); + params.setDiskMap(vm.getDiskMap()); + updateDiskQuotas(new ArrayList<Disk>(params.getDiskMap().values())); + } parameters.add(params); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportEntityData.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportEntityData.java index 79e4ea0..beff1c1 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportEntityData.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportEntityData.java @@ -81,25 +81,6 @@ return names; } - public void selectClusterQuotaByName(String name) { - for (Quota quota : getClusterQuota().getItems()) { - if (quota.getQuotaName().equals(name)) { - getClusterQuota().setSelectedItem(quota); - break; - } - } - } - - public List<String> getClusterQuotaNames() { - List<String> names = new ArrayList<String>(); - if (getClusterQuota().getItems() != null) { - for (Quota quota : getClusterQuota().getItems()) { - names.add(quota.getQuotaName()); - } - } - return names; - } - public abstract ArchitectureType getArchType(); public abstract String getName(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java index 0967261..1274762 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityInfoPanel.java @@ -2,13 +2,19 @@ import java.util.ArrayList; import java.util.Date; +import java.util.List; +import java.util.Map; +import com.google.gwt.cell.client.FieldUpdater; +import com.google.gwt.user.cellview.client.Column; import com.google.gwt.view.client.NoSelectionModel; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.ImageStatus; +import org.ovirt.engine.core.common.businessentities.Quota; import org.ovirt.engine.core.common.businessentities.VolumeType; import org.ovirt.engine.core.common.businessentities.network.VmInterfaceType; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; +import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.ui.common.widget.editor.EntityModelCellTable; import org.ovirt.engine.ui.common.widget.table.column.DiskImageStatusColumn; import org.ovirt.engine.ui.common.widget.table.column.DiskSizeColumn; @@ -19,6 +25,7 @@ import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; +import org.ovirt.engine.ui.uicommonweb.models.storage.RegisterEntityModel; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportEntityData; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -27,6 +34,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Style; import com.google.gwt.user.client.ui.TabLayoutPanel; +import org.ovirt.engine.ui.webadmin.widget.table.column.CustomSelectionCell; public abstract class RegisterEntityInfoPanel extends TabLayoutPanel { @@ -38,8 +46,11 @@ protected EntityModelCellTable<ListModel> nicsTable; protected EntityModelCellTable<ListModel> appsTable; - public RegisterEntityInfoPanel() { + protected RegisterEntityModel registerEntityModel; + + public RegisterEntityInfoPanel(RegisterEntityModel registerEntityModel) { super(templates.TAB_BAR_HEIGHT, Style.Unit.PX); + this.registerEntityModel = registerEntityModel; init(); addStyles(); @@ -113,7 +124,7 @@ return object.getCreationDate(); } }; - disksTable.addColumn(dateCreatedColumn, constants.creationDateDisk(), "80px"); //$NON-NLS-1$ + disksTable.addColumn(dateCreatedColumn, constants.creationDateDisk(), "100px"); //$NON-NLS-1$ TextColumnWithTooltip<DiskImage> descriptionColumn = new TextColumnWithTooltip<DiskImage>() { @Override @@ -121,13 +132,49 @@ return object.getDiskDescription(); } }; - disksTable.addColumn(descriptionColumn, constants.descriptionDisk(), "80px"); //$NON-NLS-1$ + disksTable.addColumn(descriptionColumn, constants.descriptionDisk(), "100px"); //$NON-NLS-1$ + + if (registerEntityModel.isQuotaEnabled()) { + disksTable.addColumn(getDiskQuotaColumn(), constants.quotaVm(), "100px"); //$NON-NLS-1$ + } disksTable.setRowData(new ArrayList<EntityModel>()); disksTable.setWidth("100%", true); //$NON-NLS-1$ disksTable.setSelectionModel(new NoSelectionModel()); } + private Column getDiskQuotaColumn() { + CustomSelectionCell customSelectionCell = new CustomSelectionCell(new ArrayList<String>()); + customSelectionCell.setStyle("input-group col-xs-11"); //$NON-NLS-1$ + + Column column = new Column<DiskImage, String>(customSelectionCell) { + @Override + public String getValue(DiskImage disk) { + List<Quota> quotas = (List<Quota>) registerEntityModel.getStorageQuota().getItems(); + if (quotas == null || quotas.isEmpty()) { + return constants.empty(); + } + + Map<Guid, Quota> diskQuotaMap = registerEntityModel.getDiskQuotaMap().getEntity(); + if (diskQuotaMap.get(disk.getId()) == null) { + diskQuotaMap.put(disk.getId(), quotas.get(0)); + ((CustomSelectionCell) getCell()).setOptions(registerEntityModel.getQuotaNames(quotas)); + } + + return diskQuotaMap.get(disk.getId()).getQuotaName(); + } + }; + column.setFieldUpdater(new FieldUpdater<DiskImage, String>() { + @Override + public void update(int index, DiskImage disk, String value) { + Quota quota = registerEntityModel.getQuotaByName(value, (List<Quota>) registerEntityModel.getStorageQuota().getItems()); + registerEntityModel.getDiskQuotaMap().getEntity().put(disk.getId(), quota); + } + }); + + return column; + } + protected void initNicsTable() { nicsTable = new EntityModelCellTable<ListModel>(false, true); nicsTable.enableColumnResizing(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityPopupView.java index cb92c13..3cec255 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterEntityPopupView.java @@ -76,8 +76,8 @@ asWidget().enableResizeSupport(true); } - abstract void createEntityTable(RegisterEntityModel model); - abstract void createInfoPanel(); + abstract protected void createEntityTable(RegisterEntityModel model); + abstract protected void createInfoPanel(RegisterEntityModel model); private void initTables() { // Create the entities main table @@ -90,7 +90,7 @@ private void createTables(RegisterEntityModel model) { createEntityTable(model); - createInfoPanel(); + createInfoPanel(model); entityTable.asEditor().edit(model.getEntities()); } @@ -128,6 +128,13 @@ }); model.getClusterQuotasMap().getEntityChangedEvent().addListener(new IEventListener() { + @Override + public void eventRaised(Event ev, Object sender, EventArgs args) { + refreshEntityTable(); + } + }); + + model.getStorageQuota().getItemsChangedEvent().addListener(new IEventListener() { @Override public void eventRaised(Event ev, Object sender, EventArgs args) { refreshEntityTable(); @@ -176,7 +183,7 @@ List<Quota> quotas = registerEntityModel.getClusterQuotasMap().getEntity().get(clusterId); object.getClusterQuota().setItems(quotas); - ((CustomSelectionCell) getCell()).setOptions(object.getClusterQuotaNames()); + ((CustomSelectionCell) getCell()).setOptions(registerEntityModel.getQuotaNames(quotas)); return object.getClusterQuota().getSelectedItem() != null ? object.getClusterQuota().getSelectedItem().getQuotaName() : constants.empty(); @@ -185,7 +192,7 @@ column.setFieldUpdater(new FieldUpdater<ImportEntityData, String>() { @Override public void update(int index, ImportEntityData object, String value) { - object.selectClusterQuotaByName(value); + registerEntityModel.selectQuotaByName(value, object.getClusterQuota()); } }); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java index 2c2cc91..56bf7f2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; +import org.ovirt.engine.ui.uicommonweb.models.storage.RegisterEntityModel; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportEntityData; @@ -18,6 +19,10 @@ private ImportTemplateGeneralSubTabView generalView; private TemplateGeneralModel templateGeneralModel; + public RegisterTemplateInfoPanel(RegisterEntityModel model) { + super(model); + } + @Override protected void init() { // Initialize Tables diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplatePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplatePopupView.java index 7cc45b6..bbf7a2b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplatePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplatePopupView.java @@ -89,8 +89,8 @@ } @Override - void createInfoPanel() { - registerEntityInfoPanel = new RegisterTemplateInfoPanel(); + protected void createInfoPanel(RegisterEntityModel model) { + registerEntityInfoPanel = new RegisterTemplateInfoPanel(model); entityInfoContainer.add(registerEntityInfoPanel); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java index 0ceb73a..0db17c8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java @@ -3,6 +3,7 @@ import com.google.gwt.user.client.ui.ScrollPanel; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; +import org.ovirt.engine.ui.uicommonweb.models.storage.RegisterEntityModel; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportEntityData; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportVmData; import org.ovirt.engine.ui.uicommonweb.models.vms.VmGeneralModel; @@ -17,6 +18,10 @@ private ImportVmGeneralSubTabView generalView; private VmGeneralModel vmGeneralModel; + public RegisterVmInfoPanel(RegisterEntityModel model) { + super(model); + } + @Override protected void init() { // Initialize Tables diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java index e73dacd..0e42664 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java @@ -89,8 +89,8 @@ } @Override - void createInfoPanel() { - registerEntityInfoPanel = new RegisterVmInfoPanel(); + protected void createInfoPanel(RegisterEntityModel model) { + registerEntityInfoPanel = new RegisterVmInfoPanel(model); entityInfoContainer.add(registerEntityInfoPanel); } -- To view, visit http://gerrit.ovirt.org/28729 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1bb85c0f5bee8a06c967a50e6309ff28c3ea3dfd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
