External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-02 18:18:12 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix pagination text when items displayed matches number of items per page

Browse Source
This commit is contained in:
Keith Grant
2019-03-06 14:30:21 -05:00
parent e935776067
commit 4d15df2b48
2 changed files with 64 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/Pagination/Pagination.jsx
View File

@@ -116,7 +116,12 @@ class Pagination extends Component {
const isOnFirst = page === 1;
const isOnLast = page === pageCount;
const itemCount = isOnLast ? count % page_size : page_size;
let itemCount;
if (!isOnLast || count === page_size) {
itemCount = page_size;
} else {
itemCount = count % page_size;
}
const itemMin = ((page - 1) * page_size) + 1;
const itemMax = itemMin + itemCount - 1;
@@ -154,7 +159,7 @@ class Pagination extends Component {
)}
<div className="awx-pagination__counts">
<div className="awx-pagination__item-count">
<Trans>{`Items ${itemMin} - ${itemMax} of ${count}`}</Trans>
<Trans>{`Items ${itemMin} – ${itemMax} of ${count}`}</Trans>
</div>
{pageCount !== 1 && (
<div className="awx-pagination__page-count">