feature[ats_E6W8N]: Polish paging component

2 files changed, 25 insertions, 15 deletions

diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
index 05177c0..d74a11f 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
@@ -141,27 +141,34 @@ public class OseePagingComponent extends HorizontalLayout implements PagingCompo
    }
 
    private void updateLayout() {
-      if (manyPages <= 0) {
+      if (allItemsPerPage) {
          firstButton.setEnabled(false);
          previousButton.setEnabled(false);
          nextButton.setEnabled(false);
          lastButton.setEnabled(false);
-      }
-
-      if (currentPage <= 0) {
-         firstButton.setEnabled(false);
-         previousButton.setEnabled(false);
       } else {
-         firstButton.setEnabled(true);
-         previousButton.setEnabled(true);
-      }
+         if (manyPages <= 0) {
+            firstButton.setEnabled(false);
+            previousButton.setEnabled(false);
+            nextButton.setEnabled(false);
+            lastButton.setEnabled(false);
+         }
 
-      if (currentPage >= manyPages - 1) {
-         nextButton.setEnabled(false);
-         lastButton.setEnabled(false);
-      } else {
-         nextButton.setEnabled(true);
-         lastButton.setEnabled(true);
+         if (currentPage <= 0) {
+            firstButton.setEnabled(false);
+            previousButton.setEnabled(false);
+         } else {
+            firstButton.setEnabled(true);
+            previousButton.setEnabled(true);
+         }
+
+         if (currentPage >= manyPages - 1) {
+            nextButton.setEnabled(false);
+            lastButton.setEnabled(false);
+         } else {
+            nextButton.setEnabled(true);
+            lastButton.setEnabled(true);
+         }
       }
 
       //Update page numbers
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
index 691ea80..ca80747 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
@@ -186,6 +186,9 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
       int lastCompIndex = mainLayout.getComponentIndex(bottomSpacer);
       mainLayout.addComponent(searchResultComp, lastCompIndex);
 
+      //This call is needed in order to only show those results which are on the current page.
+      updateSearchResultsLayout();
+
       return searchResultComp;
    }