Frank Kobzik has uploaded a new change for review. Change subject: frontend: Add paging in SubTabPoolVmView ......................................................................
frontend: Add paging in SubTabPoolVmView This patch adds support for paging in SubTabPoolVmView. For this a separate attribute, which holds the state of paging, was introduced in SearchableListModel. Change-Id: I358183c42e15a97bec65dbbe1823b611f1c49692 Bug-Url: https://bugzilla.redhat.com/989041 Signed-off-by: Frantisek Kobzik <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SearchableListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java 2 files changed, 7 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/17450/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 65da13b..c013fe8 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 @@ -184,7 +184,7 @@ public String getSearchString() { - return searchString; + return searchString + (pagingSearchString == null ? "" : pagingSearchString); } public void setSearchString(String value) @@ -196,6 +196,8 @@ onPropertyChanged(new PropertyChangedEventArgs("SearchString")); //$NON-NLS-1$ } } + + private String pagingSearchString; public int getSearchPageNumber() { @@ -566,18 +568,8 @@ && getPreviousSearchPageAllowed()); } - private void setSearchStringPage(int newSearchPageNumber) - { - if (Regex.IsMatch(getSearchString(), PAGE_STRING_REGEX, RegexOptions.IgnoreCase)) - { - setSearchString(Regex.replace(getSearchString(), - PAGE_STRING_REGEX, - " page " + newSearchPageNumber)); //$NON-NLS-1$ - } - else - { - setSearchString(getSearchString() + " page " + newSearchPageNumber); //$NON-NLS-1$ - } + private void setSearchStringPage(int newSearchPageNumber) { + this.pagingSearchString = " page " + newSearchPageNumber; //$NON-NLS-1$ } protected void searchNextPage() diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java index 5e5ffab..717fbbf 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/pool/SubTabPoolVmView.java @@ -30,6 +30,8 @@ } void initTable(ApplicationConstants constants) { + getTable().showPagingButtons(); + getTable().enableColumnResizing(); getTable().addColumn(new VmStatusColumn(), constants.empty(), "30px"); //$NON-NLS-1$ -- To view, visit http://gerrit.ovirt.org/17450 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I358183c42e15a97bec65dbbe1823b611f1c49692 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
