Frank Kobzik has uploaded a new change for review. Change subject: usertportal: Console buttons are still active after VM is launched. ......................................................................
usertportal: Console buttons are still active after VM is launched. After spice console connecting/disconnecting in extended usertportar view, the ui state of the console buttons was not updated. This behavior is reproducible since patch 09f1acafa2a508f90ea9a7a77f79693d8e8224d6 in upstream. The problem was in not comparing console state in the logic that was responsible for deciding whether to refresh the view. Fixed by adding check for console state change. Change-Id: I6b260c338dbc2f1156f00732842caf59d7fd1bb2 Bug-Url: https://bugzilla.redhat.com/951666 Signed-off-by: Frantisek Kobzik <fkob...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalItemModel.java 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/14641/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalItemModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalItemModel.java index c7fe7c1..18bf18e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalItemModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalItemModel.java @@ -451,8 +451,9 @@ else if (getEntity() instanceof VM && other.getEntity() instanceof VM) { VM thisVm = (VM) getEntity(); VM otherVm = (VM) other.getEntity(); - return thisVm.getDynamicData().getStatus().equals(otherVm.getDynamicData().getStatus()) - && thisVm.getStaticData().equals(otherVm.getStaticData()); + return thisVm.getDynamicData().getStatus().equals(otherVm.getDynamicData().getStatus()) + && thisVm.getDynamicData().getConsoleCurrentUserName().equals(otherVm.getDynamicData().getConsoleCurrentUserName()) + && thisVm.getStaticData().equals(otherVm.getStaticData()); } return false; } -- To view, visit http://gerrit.ovirt.org/14641 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b260c338dbc2f1156f00732842caf59d7fd1bb2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <fkob...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
