Tomas Jelinek has uploaded a new change for review. Change subject: frontend: in some cases the display options are not taken from template ......................................................................
frontend: in some cases the display options are not taken from template The problem was that firt the options depending on the display protocol has been copied from template to VM and than the display type. It could happen, that you had a display protocol e.g. VLC and than you have selected something which makes sense only for SPICE, than this options has been ignored. Fixed by moving the relevant options under the display protocol setting. Change-Id: I77a995eff3e800ba000cc3049eb1929d30ee91e8 Bug-Url: https://bugzilla.redhat.com/952712 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java 3 files changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/16450/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java index a909e30..411b600 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java @@ -194,7 +194,6 @@ getModel().getMinAllocatedMemory().setEntity(this.vm.getMinAllocatedMem()); getModel().getOSType().setSelectedItem(this.vm.getVmOsId()); getModel().getDomain().setSelectedItem(this.vm.getVmDomain()); - getModel().getUsbPolicy().setSelectedItem(this.vm.getUsbPolicy()); getModel().getNumOfMonitors().setSelectedItem(this.vm.getNumOfMonitors()); getModel().getAllowConsoleReconnect().setEntity(this.vm.getAllowConsoleReconnect()); getModel().setBootSequence(this.vm.getDefaultBootSequence()); @@ -203,8 +202,6 @@ getModel().getIsStateless().setEntity(this.vm.isStateless()); getModel().getIsRunAndPause().setEntity(this.vm.isRunAndPause()); getModel().getIsDeleteProtected().setEntity(this.vm.isDeleteProtected()); - getModel().getIsSmartcardEnabled().setEntity(this.vm.isSmartcardEnabled()); - getModel().getVncKeyboardLayout().setSelectedItem(this.vm.getVncKeyboardLayout()); updateSelectedCdImage(this.vm.getStaticData()); updateTimeZone(this.vm.getTimeZone()); @@ -229,6 +226,10 @@ } } + getModel().getUsbPolicy().setSelectedItem(this.vm.getUsbPolicy()); + getModel().getIsSmartcardEnabled().setEntity(this.vm.isSmartcardEnabled()); + getModel().getVncKeyboardLayout().setSelectedItem(this.vm.getVncKeyboardLayout()); + initPriority(this.vm.getPriority()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index b8b3270..fad95d6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -81,7 +81,6 @@ getModel().getNumOfMonitors().setSelectedItem(template.getNumOfMonitors()); getModel().getDomain().setSelectedItem(template.getDomain()); getModel().getMemSize().setEntity(template.getMemSizeMb()); - getModel().getUsbPolicy().setSelectedItem(template.getUsbPolicy()); getModel().setBootSequence(template.getDefaultBootSequence()); getModel().getIsHighlyAvailable().setEntity(template.isAutoStartup()); @@ -90,7 +89,6 @@ getModel().getIsSmartcardEnabled().setEntity(template.isSmartcardEnabled()); getModel().getIsDeleteProtected().setEntity(template.isDeleteProtected()); - getModel().getVncKeyboardLayout().setSelectedItem(template.getVncKeyboardLayout()); getModel().getIsStateless().setEntity(template.isStateless()); getModel().getAllowConsoleReconnect().setEntity(template.isAllowConsoleReconnect()); @@ -128,6 +126,8 @@ } } getModel().getDisplayProtocol().setSelectedItem(displayProtocol); + getModel().getUsbPolicy().setSelectedItem(template.getUsbPolicy()); + getModel().getVncKeyboardLayout().setSelectedItem(template.getVncKeyboardLayout()); // By default, take kernel params from template. getModel().getKernel_path().setEntity(template.getKernelUrl()); 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 f129085..e546266 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 @@ -90,12 +90,10 @@ getModel().getNumOfMonitors().setSelectedItem(vmBase.getNumOfMonitors()); getModel().getDomain().setSelectedItem(vmBase.getDomain()); getModel().getMemSize().setEntity(vmBase.getMemSizeMb()); - getModel().getUsbPolicy().setSelectedItem(vmBase.getUsbPolicy()); getModel().setBootSequence(vmBase.getDefaultBootSequence()); getModel().getIsHighlyAvailable().setEntity(vmBase.isAutoStartup()); getModel().getIsDeleteProtected().setEntity(vmBase.isDeleteProtected()); getModel().getIsSmartcardEnabled().setEntity(vmBase.isSmartcardEnabled()); - getModel().getVncKeyboardLayout().setSelectedItem(vmBase.getVncKeyboardLayout()); getModel().getIsRunAndPause().setEntity(false); boolean hasCd = !StringHelper.isNullOrEmpty(vmBase.getIsoPath()); @@ -140,6 +138,8 @@ } } getModel().getDisplayProtocol().setSelectedItem(displayProtocol); + getModel().getUsbPolicy().setSelectedItem(vmBase.getUsbPolicy()); + getModel().getVncKeyboardLayout().setSelectedItem(vmBase.getVncKeyboardLayout()); // By default, take kernel params from template. getModel().getKernel_path().setEntity(vmBase.getKernelUrl()); -- To view, visit http://gerrit.ovirt.org/16450 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77a995eff3e800ba000cc3049eb1929d30ee91e8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
