Arik Hadas has uploaded a new change for review. Change subject: webadmin: fix cpu-profile setting on import dialog ......................................................................
webadmin: fix cpu-profile setting on import dialog In the new two-phases import dialog, the cpu-profile setting was cleared when switching to the second screen and then back to the first screen. This patch fix it by not initializing a new instance of ImportVmFromExportDomainModel on every switch to the second screen. Instead, we initialize it in advance and use the same instance. Change-Id: I8bb3e500952949acf3795a5f92dd6160a4df9171 Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmFromExportDomainPopupView.java 3 files changed, 35 insertions(+), 32 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/37879/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java index 9289dcd..eabd422 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java @@ -45,6 +45,7 @@ private UICommand cancelImportCommand = new UICommand(null, this); private Provider<ImportVmFromExportDomainModel> importFromExportDomainModelProvider; + ImportVmFromExportDomainModel model; private EntityModel<Boolean> importSourceValid; @@ -59,15 +60,21 @@ setImportSourceValid(new EntityModel<Boolean>(true)); } - @SuppressWarnings("unchecked") - public ImportVmFromExportDomainModel getSpecificImportModel() { - ImportVmFromExportDomainModel model = importFromExportDomainModelProvider.get(); - model.init(getVmsToImport(), exportDomain.getId()); - model.setEntity(exportDomain.getId()); + public void initImportFromExportDomainModel(UICommand ... commands) { + model = importFromExportDomainModelProvider.get(); model.setTitle(ConstantsManager.getInstance().getConstants().importVirtualMachinesTitle()); model.setHelpTag(HelpTag.import_virtual_machine); model.setHashName("import_virtual_machine"); //$NON-NLS-1$ + for (UICommand command : commands) { + model.getCommands().add(command); + } + } + @SuppressWarnings("unchecked") + public ImportVmFromExportDomainModel getSpecificImportModel() { + model.setEntity(null); + model.init(getVmsToImport(), exportDomain.getId()); + model.setEntity(exportDomain.getId()); return model; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index ceb174b..2847f60 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -2535,7 +2535,7 @@ return; } - ImportVmsModel model = importVmsModelProvider.get(); + final ImportVmsModel model = importVmsModelProvider.get(); model.init(); setWindow(model); @@ -2549,6 +2549,27 @@ .setTitle(ConstantsManager.getInstance().getConstants().cancel()) .setIsCancel(true) ); + + model.initImportFromExportDomainModel( + new UICommand(CMD_RESTORE_FROM_EXPORT_DOMAIN, new BaseCommandTarget() { + @Override + public void executeCommand(UICommand uiCommand) { + onRestoreFromExportDomain(); + } + }).setTitle(ConstantsManager.getInstance().getConstants().ok()) + .setIsDefault(true) + , + new UICommand(CMD_BACK, new BaseCommandTarget() { + @Override + public void executeCommand(UICommand uiCommand) { + setWindow(null); // remove current window first + setWindow(model); + } + }).setTitle(ConstantsManager.getInstance().getConstants().back()) + , + new UICommand(CMD_CANCEL, this).setIsCancel(true) + .setTitle(ConstantsManager.getInstance().getConstants().cancel()) + ); } private void cloneVm() { @@ -2586,31 +2607,6 @@ ImportVmFromExportDomainModel model = importVmsModel.getSpecificImportModel(); setWindow(null); // remove import-vms window first setWindow(model); - - model.getCommands().add(new UICommand(CMD_RESTORE_FROM_EXPORT_DOMAIN, new BaseCommandTarget() { - @Override - public void executeCommand(UICommand uiCommand) { - onRestoreFromExportDomain(); - } - }) - .setTitle(ConstantsManager.getInstance().getConstants().ok()) - .setIsDefault(true) - ); - - model.getCommands().add(new UICommand(CMD_BACK, new BaseCommandTarget() { - @Override - public void executeCommand(UICommand uiCommand) { - setWindow(null); // remove current window first - setWindow(importVmsModel); - } - }) - .setTitle(ConstantsManager.getInstance().getConstants().back()) - ); - - model.getCommands().add(new UICommand(CMD_CANCEL, this) - .setTitle(ConstantsManager.getInstance().getConstants().cancel()) - .setIsCancel(true) - ); } private void connectToConsoles() { 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 ad8889e..ca0d1f9 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 @@ -43,9 +43,9 @@ import org.ovirt.engine.ui.webadmin.ApplicationResources; 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.AbstractWebAdminImageResourceColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.IsProblematicImportVmColumn; import org.ovirt.engine.ui.webadmin.widget.table.column.VmTypeColumn; -import org.ovirt.engine.ui.webadmin.widget.table.column.AbstractWebAdminImageResourceColumn; import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.core.client.GWT; -- To view, visit http://gerrit.ovirt.org/37879 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bb3e500952949acf3795a5f92dd6160a4df9171 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
