diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index f6d634492..5fd4a0957 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -925,9 +925,9 @@ document.addEventListener('DOMContentLoaded', function() { initializeTooltips(); updatePagination(data.page, data.num_pages, data.has_previous, data.has_next); - currentPage = page; - currentSortBy = sortBy; - currentOrder = order; + currentPage = page; + currentSortBy = sortBy; + currentOrder = order; }) .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 => { header.addEventListener('click', function() { 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); }); }); @@ -1128,7 +1131,10 @@ document.addEventListener('DOMContentLoaded', function() { document.querySelectorAll('.dotgov-table__domain-requests th[data-sortable]').forEach(header => { header.addEventListener('click', function() { 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); }); }); diff --git a/src/registrar/templates/home.html b/src/registrar/templates/home.html index cd4d1ed83..0f101717d 100644 --- a/src/registrar/templates/home.html +++ b/src/registrar/templates/home.html @@ -76,7 +76,7 @@ Your domain requests - Domain name + Domain name Date submitted Status Action diff --git a/src/registrar/views/domains_json.py b/src/registrar/views/domains_json.py index c49338693..c65fedd52 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, 3) page_number = request.GET.get('page') page_obj = paginator.get_page(page_number)