Fix JS check, revise authentication check

This commit is contained in:
Rachid Mrad 2024-05-30 17:05:05 -04:00
parent 996a6944a3
commit fc52d98f21
No known key found for this signature in database
3 changed files with 333 additions and 331 deletions

View file

@ -912,9 +912,11 @@ function ScrollToElement(attributeName, attributeValue) {
*
*/
document.addEventListener('DOMContentLoaded', function() {
let domainsWrapper = document.querySelector('.domains-wrapper');
if (domainsWrapper) {
let currentSortBy = 'id';
let currentOrder = 'asc';
let domainsWrapper = document.querySelector('.domains-wrapper');
let noDomainsWrapper = document.querySelector('.no-domains-wrapper');
let hasLoaded = false;
@ -1086,6 +1088,7 @@ document.addEventListener('DOMContentLoaded', function() {
// Load the first page initially
loadDomains(1);
}
});
/**
@ -1094,9 +1097,11 @@ document.addEventListener('DOMContentLoaded', function() {
*
*/
document.addEventListener('DOMContentLoaded', function() {
let domainRequestsWrapper = document.querySelector('.domain-requests-wrapper');
if (domainRequestsWrapper) {
let currentSortBy = 'id';
let currentOrder = 'asc';
let domainRequestsWrapper = document.querySelector('.domain-requests-wrapper');
let noDomainRequestsWrapper = document.querySelector('.no-domain-requests-wrapper');
let hasLoaded = false;
@ -1275,4 +1280,5 @@ document.addEventListener('DOMContentLoaded', function() {
// Load the first page initially
loadDomainRequests(1);
}
});

View file

@ -2,15 +2,13 @@ from django.http import JsonResponse
from django.core.paginator import Paginator
from registrar.models import DomainRequest
from django.utils.dateformat import format
from django.contrib.auth.decorators import login_required
@login_required
def get_domain_requests_json(request):
"""Given the current request,
get all domain requests that are associated with the request user and exclude the APPROVED ones"""
if not request.user.is_authenticated:
return JsonResponse({"error": "User not authenticated"}, status=401)
domain_requests = DomainRequest.objects.filter(creator=request.user).exclude(
status=DomainRequest.DomainRequestStatus.APPROVED
)

View file

@ -1,15 +1,13 @@
from django.http import JsonResponse
from django.core.paginator import Paginator
from registrar.models import UserDomainRole, Domain
from django.contrib.auth.decorators import login_required
@login_required
def get_domains_json(request):
"""Given the current request,
get all domains that are associated with the UserDomainRole object"""
if not request.user.is_authenticated:
return JsonResponse({"error": "User not authenticated"}, status=401)
user_domain_roles = UserDomainRole.objects.filter(user=request.user)
domain_ids = user_domain_roles.values_list("domain_id", flat=True)