Ravi Nori has uploaded a new change for review. Change subject: webadmin: search paging on event log does not use paging correctly ......................................................................
webadmin: search paging on event log does not use paging correctly search paging on event log does not use paging correctly If we browse to 2nd page from UI Events TAB by pressing the '>' button and then put "Vms: page 1" as the search text , we an error on server side Change-Id: I86787302601365e07f9d923f26d483c7bceb30ef Bug-Url: https://bugzilla.redhat.com/1064395 Signed-off-by: Ravi Nori <rn...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/24795/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java index 94ca787..b646515 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java @@ -205,6 +205,7 @@ if (!StringHelper.stringsEqual(searchString, value)) { searchString = value; + pagingSearchString = null; searchStringChanged(); onPropertyChanged(new PropertyChangedEventArgs("SearchString")); //$NON-NLS-1$ } @@ -659,16 +660,26 @@ protected void searchNextPage() { + searchString = stripPageKeyword(searchString); setSearchStringPage(getNextSearchPageNumber()); getSearchCommand().execute(); } protected void searchPreviousPage() { + searchString = stripPageKeyword(searchString); setSearchStringPage(getPreviousSearchPageNumber()); getSearchCommand().execute(); } + private String stripPageKeyword(String str) { + int index = str.indexOf("page"); //$NON-NLS-1$ + if (index == -1) { + return str; + } + return str.substring(0, index); + } + protected boolean getNextSearchPageAllowed() { if (!getSearchNextPageCommand().getIsAvailable() || getItems() == null -- To view, visit http://gerrit.ovirt.org/24795 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86787302601365e07f9d923f26d483c7bceb30ef Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Ravi Nori <rn...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
