From e74e4f45e28a350e9b9525bf39c7120a131750ee Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 22 May 2024 14:55:51 -0400 Subject: [PATCH] toggle pagination, template tweaks --- src/registrar/assets/js/get-gov.js | 8 ++++++-- src/registrar/views/domain_requests_json.py | 2 +- src/registrar/views/domains_json.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index f6d634492..484e435d3 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -937,6 +937,8 @@ document.addEventListener('DOMContentLoaded', function() { const paginationContainer = document.querySelector('#domains-pagination .usa-pagination__list'); paginationContainer.innerHTML = ''; + paginationContainer.classList.toggle('display-none', numPages <= 1); + if (hasPrevious) { const prevPageItem = document.createElement('li'); prevPageItem.className = 'usa-pagination__item usa-pagination__arrow'; @@ -1024,8 +1026,8 @@ document.addEventListener('DOMContentLoaded', function() { unloadModals(); data.domain_requests.forEach(request => { - const domainName = request.requested_domain ? request.requested_domain : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`; - const submissionDate = request.submission_date ? new Date(request.submission_date).toLocaleDateString() : 'Not submitted'; + const domainName = request.requested_domain ? request.requested_domain : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`; + const submissionDate = request.submission_date ? new Date(request.submission_date).toLocaleDateString() : `Not submitted`; const actionUrl = (request.status === 'Started' || request.status === 'Withdrawn') ? `/domain-request/${request.id}/edit` : `/domain-request/${request.id}`; const actionLabel = (request.status === 'Started' || request.status === 'Withdrawn') ? 'Edit' : 'Manage'; const deleteButton = request.is_deletable ? ` @@ -1079,6 +1081,8 @@ document.addEventListener('DOMContentLoaded', function() { const paginationContainer = document.querySelector('#domain-requests-pagination .usa-pagination__list'); paginationContainer.innerHTML = ''; + paginationContainer.classList.toggle('display-none', numPages <= 1); + if (hasPrevious) { const prevPageItem = document.createElement('li'); prevPageItem.className = 'usa-pagination__item usa-pagination__arrow'; diff --git a/src/registrar/views/domain_requests_json.py b/src/registrar/views/domain_requests_json.py index e54fffcf8..a212e519e 100644 --- a/src/registrar/views/domain_requests_json.py +++ b/src/registrar/views/domain_requests_json.py @@ -19,7 +19,7 @@ def get_domain_requests_json(request): sort_by = f'-{sort_by}' domain_requests = domain_requests.order_by(sort_by) page_number = request.GET.get('page', 1) - paginator = Paginator(domain_requests, 2) # Adjust the number of items per page as needed + paginator = Paginator(domain_requests, 10) # Adjust the number of items per page as needed page_obj = paginator.get_page(page_number) domain_requests_data = [ diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py index c49338693..4b5011034 100644 --- a/src/registrar/views/domains_json.py +++ b/src/registrar/views/domains_json.py @@ -27,7 +27,7 @@ def get_domains_json(request): sort_by = f'-{sort_by}' objects = objects.order_by(sort_by) - paginator = Paginator(objects, 1) + paginator = Paginator(objects, 10) page_number = request.GET.get('page') page_obj = paginator.get_page(page_number)