Pagination widget update (#1468)

* Update paginated-data.html

* Update paginated-data-server-script.js

Author: earlduque

Service Portal Widgets/Paginated Data/paginated-data-server-script.js

@@ -3,7 +3,8 @@
 	data.recordsTable = 'task';
 	data.recordsQuery = ''; // The encoded query to filter records (empty means all records)
 	data.recordsFields = ['number', 'short_description']; // The fields to retrieve for each record
-	data.recordsPerPage = 10;
+	data.recordsPerPage = parseInt($sp.getParameter('display')) || 10;
+	data.userQuery = $sp.getParameter('query');
 
 	// Get pagination parameters
 	data.page_id = $sp.getParameter('id');
@@ -13,6 +14,7 @@
 	// Count total records
 	var countGa = new GlideAggregate(data.recordsTable);
 	countGa.addEncodedQuery(data.recordsQuery);
+	countGa.addEncodedQuery(data.userQuery);
 	countGa.addAggregate('COUNT');
 	countGa.query();
 	if (countGa.next()) {
@@ -34,6 +36,7 @@
 	data.records = [];
 	var recordsGr = new GlideRecord(data.recordsTable);
 	recordsGr.addEncodedQuery(data.recordsQuery);
+	recordsGr.addEncodedQuery(data.userQuery);
 	recordsGr.chooseWindow(data.rowStart, rowEnd);
 	recordsGr.query();
 	while (recordsGr.next()) {

Service Portal Widgets/Paginated Data/paginated-data.html

@@ -7,7 +7,7 @@
   <nav aria-label="Page navigation" ng-if="data.count > 0">
     <ul class="pagination">
       <li class="page-item">
-        <a class="page-link" href="?id={{data.page_id}}&page={{data.page-1}}" aria-label="Previous" ng-if="data.page > 1">
+        <a class="page-link" href="?id={{data.page_id}}&page={{data.page-1}}&display={{data.display}}&query={{data.userQuery}}" aria-label="Previous" ng-if="data.page > 1">
           <span aria-hidden="true">&laquo;</span>
           <span class="sr-only">Previous</span>
         </a>
@@ -16,9 +16,9 @@
           <span class="sr-only">Previous</span>
         </a>
       </li>
-      <li class="page-item" ng-repeat="page in data.pages track by $index" ng-class="{active: page == data.page}"><a class="page-link" href="?id={{data.page_id}}&page={{page}}" ng-if="page != '...'">{{page}}</a><span ng-if="page == '...'">...</span></li>
+      <li class="page-item" ng-repeat="page in data.pages track by $index" ng-class="{active: page == data.page}"><a class="page-link" href="?id={{data.page_id}}&page={{page}}&display={{data.display}}&query={{data.userQuery}}" ng-if="page != '...'">{{page}}</a><span ng-if="page == '...'">...</span></li>
       <li class="page-item">
-        <a class="page-link" href="?id={{data.page_id}}&page={{data.page+1}}" aria-label="Next" ng-if="data.page < data.pages[data.pages.length - 1]">
+        <a class="page-link" href="?id={{data.page_id}}&page={{data.page+1}}&display={{data.display}}&query={{data.userQuery}}" aria-label="Next" ng-if="data.page < data.pages[data.pages.length - 1]">
           <span aria-hidden="true">&raquo;</span>
           <span class="sr-only">Next</span>
         </a>