Oved Ourfali has uploaded a new change for review. Change subject: WIP ui: wrong template displayed in edit Pool (#853727) ......................................................................
WIP ui: wrong template displayed in edit Pool (#853727) https://bugzilla.redhat.com/853727 This patch does the following: 1. When editing a VM Pool, the wrong template is shown, thus the disks that appear in the ResourceAllocation tab are also wrong, which causes backend issues. This patch fixes that issue. 2. Disables the storage domain list in the resource allocation tab when editing. Only viewing is allowed. 3. Fix audit log message when importing a VM template to contain the target storage domain name. Change-Id: I4e871596e1388cbda2697df72eb78540d59dad6b Signed-off-by: Oved Ourfali <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingPoolModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 4 files changed, 11 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/7717/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index e2b53cc..3177341 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -67,6 +67,7 @@ parameters.setEntityId(getVmTemplate().getId()); setStoragePoolId(parameters.getStoragePoolId()); setVdsGroupId(parameters.getVdsGroupId()); + setStorageDomainId(parameters.getStorageDomainId()); } protected ImportVmTemplateCommand(Guid commandId) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingPoolModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingPoolModelBehavior.java index cfc8762..ff218e5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingPoolModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingPoolModelBehavior.java @@ -29,10 +29,10 @@ getModel().setIsDisksAvailable(true); } - protected void templateInited() { - super.templateInited(); - + @Override + protected void PostInitTemplate() { setupWindowModelFrom(pool.getStaticData()); + getModel().setIsDisksAvailable(true); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java index 2aa3a48..91a7812 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java @@ -175,7 +175,7 @@ getModel().getKernel_parameters().setEntity(vmBase.getkernel_params()); getModel().getInitrd_path().setEntity(vmBase.getinitrd_url()); - getModel().setIsDisksAvailable(getModel().getIsNew()); + getModel().setIsDisksAvailable(true); if (!vmBase.getId().equals(Guid.Empty)) { @@ -269,14 +269,9 @@ } getModel().getTemplate().setItems(templates); setupSelectedTemplate(getModel().getTemplate(), templates); - templateInited(); } }), dataCenter.getId()); - } - - protected void templateInited() { - // override if needed } protected abstract void setupSelectedTemplate(ListModel model, List<VmTemplate> templates); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index f989182..8a011cc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -81,6 +81,10 @@ public abstract void UpdateMinAllocatedMemory(); + protected void PostInitTemplate() { + + } + public boolean Validate() { return true; @@ -665,6 +669,7 @@ } Linq.Sort(availableDiskStorageDomains, new Linq.StorageDomainByNameComparer()); diskModel.getStorageDomain().setItems(availableDiskStorageDomains); + diskModel.getStorageDomain().setIsChangable(getModel().getIsNew()); } ArrayList<storage_domains> storageDomainsDisjoint = @@ -744,7 +749,7 @@ .setItems(new ArrayList<VmTemplate>(Arrays.asList(new VmTemplate[] { template }))); model.getTemplate().setSelectedItem(template); model.getTemplate().setIsChangable(false); - + PostInitTemplate(); } }, getModel().getHash()), -- To view, visit http://gerrit.ovirt.org/7717 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e871596e1388cbda2697df72eb78540d59dad6b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Oved Ourfali <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
