This commit is contained in:
David Kennedy 2024-05-22 14:57:37 -04:00
parent f2b7176a4a
commit dfea3860e8
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
3 changed files with 13 additions and 7 deletions

View file

@ -925,9 +925,9 @@ document.addEventListener('DOMContentLoaded', function() {
initializeTooltips(); initializeTooltips();
updatePagination(data.page, data.num_pages, data.has_previous, data.has_next); updatePagination(data.page, data.num_pages, data.has_previous, data.has_next);
currentPage = page; currentPage = page;
currentSortBy = sortBy; currentSortBy = sortBy;
currentOrder = order; currentOrder = order;
}) })
.catch(error => console.error('Error fetching domains:', error)); .catch(error => console.error('Error fetching domains:', error));
} }
@ -986,7 +986,10 @@ document.addEventListener('DOMContentLoaded', function() {
document.querySelectorAll('.dotgov-table th[data-sortable]').forEach(header => { document.querySelectorAll('.dotgov-table th[data-sortable]').forEach(header => {
header.addEventListener('click', function() { header.addEventListener('click', function() {
const sortBy = this.getAttribute('data-sortable'); const sortBy = this.getAttribute('data-sortable');
const order = currentOrder === 'asc' ? 'desc' : 'asc'; let order = 'asc';
if (sortBy === currentSortBy) {
order = currentOrder === 'asc' ? 'desc' : 'asc';
}
loadPage(1, sortBy, order); loadPage(1, sortBy, order);
}); });
}); });
@ -1128,7 +1131,10 @@ document.addEventListener('DOMContentLoaded', function() {
document.querySelectorAll('.dotgov-table__domain-requests th[data-sortable]').forEach(header => { document.querySelectorAll('.dotgov-table__domain-requests th[data-sortable]').forEach(header => {
header.addEventListener('click', function() { header.addEventListener('click', function() {
const sortBy = this.getAttribute('data-sortable'); const sortBy = this.getAttribute('data-sortable');
const order = currentOrder === 'asc' ? 'desc' : 'asc'; let order = 'asc';
if (sortBy === currentSortBy) {
order = currentOrder === 'asc' ? 'desc' : 'asc';
}
loadDomainRequestsPage(1, sortBy, order); loadDomainRequestsPage(1, sortBy, order);
}); });
}); });

View file

@ -76,7 +76,7 @@
<caption class="sr-only">Your domain requests</caption> <caption class="sr-only">Your domain requests</caption>
<thead> <thead>
<tr> <tr>
<th data-sortable="requested_domain" scope="col" role="columnheader">Domain name</th> <th data-sortable="name" scope="col" role="columnheader">Domain name</th>
<th data-sortable="submission_date" scope="col" role="columnheader">Date submitted</th> <th data-sortable="submission_date" scope="col" role="columnheader">Date submitted</th>
<th data-sortable="status" scope="col" role="columnheader">Status</th> <th data-sortable="status" scope="col" role="columnheader">Status</th>
<th scope="col" role="columnheader"><span class="usa-sr-only">Action</span></th> <th scope="col" role="columnheader"><span class="usa-sr-only">Action</span></th>

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, 3)
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)