Change in ovirt-engine[master]: frontend: if SpiceReleaseCursorKeys is set SPICE is not open...
Tomas Jelinek has submitted this change and it was merged.
Change subject: frontend: if SpiceReleaseCursorKeys is set SPICE is not opened
......................................................................
frontend: if SpiceReleaseCursorKeys is set SPICE is not opened
If the SpiceReleaseCursorKeys changes to for example
"shift+a" than after clicking the console button the
AsyncDataProvider.getComplexValueFromSpiceRedKeysResource
throws an exception.
The problem was that the getComplexValueFromSpiceRedKeysResource
expects to have all parts of the release cursor keys in the
SpiceRedKeys. In case of "shift+a" it finds "shift" but
does not find "a" and fails.
Fixed by first tying to localize the key (look up in SpiceRedKeys)
but if it does not succeed than returning the key itself.
It is safe to do because the result of getComplexValueFromSpiceRedKeysResource
is used only to show up in the title of the SPICE window and the
SpiceRedKeys contains only the localized parts of it.
Change-Id: Iacbaadf7d6d91c04ec4ec79edc73514bad031714
Signed-off-by: Tomas Jelinek <tjelinek(a)redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
2 files changed, 14 insertions(+), 11 deletions(-)
Approvals:
Tomas Jelinek: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/17016
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacbaadf7d6d91c04ec4ec79edc73514bad031714
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server