Alexander Wels has uploaded a new change for review. Change subject: webadmin: bookmarks first try ......................................................................
webadmin: bookmarks first try - Bookmarks are not working the very first time you try, if you hadn't selected anything in the system tree yet. This was due to a system tree reset in bookmarkListModel_Navigated. This patch removes the reset and moves it into event handler that shows the system tree when moving from bookmarks or tags. Change-Id: I323869918c0affe15281526983e936db18ad6506 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1110444 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java 2 files changed, 3 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/33086/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index a58d0dd..c91aae5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -221,10 +221,6 @@ private void tagListModel_SelectedItemsChanged(Object sender, EventArgs e) { - // Reset system tree to the root item. - getSystemTree().getSelectedItemChangedEvent().removeListener(this); - getSystemTree().getResetCommand().execute(); - getSystemTree().getSelectedItemChangedEvent().addListener(this); boolean hadSelectedTags = getHasSelectedTags(); updateHasSelectedTags(); @@ -271,17 +267,12 @@ } } - private void bookmarkListModel_Navigated(Object sender, BookmarkEventArgs e) + private void bookmarkListModel_Navigated(Object sender, final BookmarkEventArgs e) { // Reset tags tree to the root item. getTagList().getSelectedItemsChangedEvent().removeListener(this); getTagList().getResetCommand().execute(); getTagList().getSelectedItemsChangedEvent().addListener(this); - - // Reset system tree to the root item. - getSystemTree().getSelectedItemChangedEvent().removeListener(this); - getSystemTree().getResetCommand().execute(); - getSystemTree().getSelectedItemChangedEvent().addListener(this); // the main tabs that should appear when a bookmark is selected should // be the exact same main tabs that are displayed when the "System" node diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java index 930982d..ec3e8c9 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java @@ -173,6 +173,8 @@ case TREE_INDEX: bookmarkModelProvider.getModel().stopRefresh(); tagModelProvider.getModel().stopRefresh(); + // Reset system tree to the root item. + treeModelProvider.getModel().getResetCommand().execute(); break; case BOOKMARK_INDEX: treeModelProvider.getModel().stopRefresh(); -- To view, visit http://gerrit.ovirt.org/33086 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I323869918c0affe15281526983e936db18ad6506 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
