Eli Mesika has uploaded a new change for review. Change subject: core: Bookmarks do not work when Search expr... ......................................................................
core: Bookmarks do not work when Search expr... Bookmarks do not work when Search expression is not empty This patch changes the search string to empty string when switching between the Tree , Bookmarks & Tags in the web admin west pane. Change-Id: I7bb9e815e84a2ca1c8a740f7e236d16835ddeeef Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1052151 Signed-off-by: Eli Mesika <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainSectionView.java 1 file changed, 21 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/26522/1 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 f9082f2..cb0d581 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 @@ -2,6 +2,7 @@ import javax.inject.Inject; +import org.apache.commons.lang.StringUtils; import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.idhandler.WithElementId; @@ -47,7 +48,9 @@ public class MainSectionView extends AbstractView implements MainSectionPresenter.ViewDef { + private static final int TREE_INDEX = 0; private static final int BOOKMARK_INDEX = 1; + private static final int TAG_INDEX = 2; private static final int SPLITTER_THICKNESS = 4; interface ViewUiBinder extends UiBinder<Widget, MainSectionView> { @@ -144,8 +147,8 @@ tagsHeader = new Label(constants.tagsMainSection()); } - StackLayoutPanel createWestStackPanel(SystemTreeModelProvider treeModelProvider, - final BookmarkModelProvider bookmarkModelProvider, TagModelProvider tagModelProvider) { + StackLayoutPanel createWestStackPanel(final SystemTreeModelProvider treeModelProvider, + final BookmarkModelProvider bookmarkModelProvider, final TagModelProvider tagModelProvider) { final StackLayoutPanel panel = new StackLayoutPanel(Unit.PX) { @Override public void onResize() { @@ -163,10 +166,22 @@ if (event == null) { return; } - if (event.getSelectedItem() == BOOKMARK_INDEX) { - bookmarkModelProvider.getModel().executeBookmarksSearch(); - } else { - bookmarkModelProvider.getModel().stopRefresh(); + treeModelProvider.getModel().setSearchString(StringUtils.EMPTY); + treeModelProvider.getModel().refresh(); + switch(event.getSelectedItem()) { + case TREE_INDEX: + bookmarkModelProvider.getModel().stopRefresh(); + tagModelProvider.getModel().stopRefresh(); + break; + case BOOKMARK_INDEX: + treeModelProvider.getModel().stopRefresh(); + tagModelProvider.getModel().stopRefresh(); + bookmarkModelProvider.getModel().executeBookmarksSearch(); + break; + case TAG_INDEX: + treeModelProvider.getModel().stopRefresh(); + bookmarkModelProvider.getModel().stopRefresh(); + break; } } }); -- To view, visit http://gerrit.ovirt.org/26522 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bb9e815e84a2ca1c8a740f7e236d16835ddeeef Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Eli Mesika <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
