zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-14 06:55:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

toggle pagination, template tweaks

Browse source
This commit is contained in:
Rachid Mrad 2024-05-22 14:55:51 -04:00
parent f2b7176a4a
commit e74e4f45e2
No known key found for this signature in database
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/registrar/assets/js/get-gov.js
View file

@ -937,6 +937,8 @@ document.addEventListener('DOMContentLoaded', function() {
const paginationContainer = document.querySelector('#domains-pagination .usa-pagination__list'); const paginationContainer = document.querySelector('#domains-pagination .usa-pagination__list');
paginationContainer.innerHTML = ''; paginationContainer.innerHTML = '';
paginationContainer.classList.toggle('display-none', numPages <= 1);
if (hasPrevious) { if (hasPrevious) {
const prevPageItem = document.createElement('li'); const prevPageItem = document.createElement('li');
prevPageItem.className = 'usa-pagination__item usa-pagination__arrow'; prevPageItem.className = 'usa-pagination__item usa-pagination__arrow';
@ -1024,8 +1026,8 @@ document.addEventListener('DOMContentLoaded', function() {
unloadModals(); unloadModals();
data.domain_requests.forEach(request => { data.domain_requests.forEach(request => {
const domainName = request.requested_domain ? request.requested_domain : `New domain request (${new Date(request.created_at).toLocaleString()} UTC)`; const domainName = request.requested_domain ? request.requested_domain : `New domain request <span class="text-base font-body-xs">(${new Date(request.created_at).toLocaleString()} UTC)</span>`;
const submissionDate = request.submission_date ? new Date(request.submission_date).toLocaleDateString() : 'Not submitted'; const submissionDate = request.submission_date ? new Date(request.submission_date).toLocaleDateString() : `<span class="text-base">Not submitted</span>`;
const actionUrl = (request.status === 'Started' || request.status === 'Withdrawn') ? `/domain-request/${request.id}/edit` : `/domain-request/${request.id}`; 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 actionLabel = (request.status === 'Started' || request.status === 'Withdrawn') ? 'Edit' : 'Manage';
const deleteButton = request.is_deletable ? ` const deleteButton = request.is_deletable ? `
@ -1079,6 +1081,8 @@ document.addEventListener('DOMContentLoaded', function() {
const paginationContainer = document.querySelector('#domain-requests-pagination .usa-pagination__list'); const paginationContainer = document.querySelector('#domain-requests-pagination .usa-pagination__list');
paginationContainer.innerHTML = ''; paginationContainer.innerHTML = '';
paginationContainer.classList.toggle('display-none', numPages <= 1);
if (hasPrevious) { if (hasPrevious) {
const prevPageItem = document.createElement('li'); const prevPageItem = document.createElement('li');
prevPageItem.className = 'usa-pagination__item usa-pagination__arrow'; prevPageItem.className = 'usa-pagination__item usa-pagination__arrow';

2
src/registrar/views/domain_requests_json.py
View file

@ -19,7 +19,7 @@ def get_domain_requests_json(request):
sort_by = f'-{sort_by}' sort_by = f'-{sort_by}'
domain_requests = domain_requests.order_by(sort_by) domain_requests = domain_requests.order_by(sort_by)
page_number = request.GET.get('page', 1) 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) page_obj = paginator.get_page(page_number)
domain_requests_data = [ domain_requests_data = [

2
src/registrar/views/domains_json.py
View file

@ -27,7 +27,7 @@ def get_domains_json(request):
sort_by = f'-{sort_by}' sort_by = f'-{sort_by}'
objects = objects.order_by(sort_by) objects = objects.order_by(sort_by)
paginator = Paginator(objects, 1) paginator = Paginator(objects, 10)
page_number = request.GET.get('page') page_number = request.GET.get('page')
page_obj = paginator.get_page(page_number) page_obj = paginator.get_page(page_number)