Skip to content

Commit

Permalink
🚜 Finish excluding applications by name too
Browse files Browse the repository at this point in the history
  • Loading branch information
jefftriplett committed May 27, 2024
1 parent 1ecefbf commit cf358c1
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions grants/views/program.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,10 @@ def get(self, request, *args, **kwargs):
# Fetch applicants
# but don't let a user see their own request
applicants = list(
self.program.applicants.exclude(email=self.request.user.email)
self.program.applicants.exclude(
Q(email=self.request.user.email) |
Q(name=self.request.user.get_full_name())
)
.prefetch_related("scores")
.order_by("-applied")
)
Expand Down Expand Up @@ -291,7 +294,8 @@ class ProgramApplicantView(ProgramMixin, TemplateView):

def get(self, request, applicant_id):
applicant = self.program.applicants.exclude(
email=self.request.user.email,
Q(email=self.request.user.email) |
Q(name=self.request.user.get_full_name())
).get(pk=applicant_id)
questions = list(self.program.questions.order_by("order"))
for question in questions:
Expand Down Expand Up @@ -349,7 +353,9 @@ class RandomUnscoredApplicant(ProgramMixin, View):
def get(self, request):
applicant = (
self.program.applicants.exclude(
Q(scores__user=self.request.user) | Q(email=self.request.user.email)
Q(scores__user=self.request.user) |
Q(email=self.request.user.email) |
Q(name=self.request.user.get_full_name())
)
.order_by("?")
.first()
Expand Down

0 comments on commit cf358c1

Please sign in to comment.