From 91ae4a4014b4bb55dfa45ce3a755b4db1619d93d Mon Sep 17 00:00:00 2001 From: Ali Karbassi Date: Wed, 20 Jan 2021 17:36:40 -0600 Subject: [PATCH] Fix missing mentor list on session detail page --- coderdojochi/views/guardian/sessions.py | 5 ++++- coderdojochi/views/mentor/sessions.py | 4 ++++ coderdojochi/views/public/sessions.py | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/coderdojochi/views/guardian/sessions.py b/coderdojochi/views/guardian/sessions.py index 24917a23..7cb1a57f 100644 --- a/coderdojochi/views/guardian/sessions.py +++ b/coderdojochi/views/guardian/sessions.py @@ -1,7 +1,7 @@ from django.shortcuts import get_object_or_404 from django.views.generic import DetailView -from ...models import Guardian, Session +from ...models import Guardian, Mentor, MentorOrder, Session class SessionDetailView(DetailView): @@ -14,5 +14,8 @@ def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context["students"] = guardian.get_students() context["spots_remaining"] = self.object.capacity - self.object.get_active_student_count() + context["active_mentors"] = Mentor.objects.filter( + id__in=MentorOrder.objects.filter(session=self.object, is_active=True).values("mentor__id") + ) return context diff --git a/coderdojochi/views/mentor/sessions.py b/coderdojochi/views/mentor/sessions.py index 6234f5ed..d77530f2 100644 --- a/coderdojochi/views/mentor/sessions.py +++ b/coderdojochi/views/mentor/sessions.py @@ -23,4 +23,8 @@ def get_context_data(self, **kwargs): context["spots_remaining"] = session.get_mentor_capacity() - session_orders.count() context["account"] = mentor + context["active_mentors"] = Mentor.objects.filter( + id__in=MentorOrder.objects.filter(session=self.object, is_active=True).values("mentor__id") + ) + return context diff --git a/coderdojochi/views/public/sessions.py b/coderdojochi/views/public/sessions.py index 86c07ebf..02a06d25 100644 --- a/coderdojochi/views/public/sessions.py +++ b/coderdojochi/views/public/sessions.py @@ -1,7 +1,7 @@ from django.shortcuts import get_object_or_404 from django.views.generic import DetailView -from ...models import Session +from ...models import Mentor, MentorOrder, Session class SessionDetailView(DetailView): @@ -11,4 +11,8 @@ class SessionDetailView(DetailView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + context["active_mentors"] = Mentor.objects.filter( + id__in=MentorOrder.objects.filter(session=self.object, is_active=True).values("mentor__id") + ) + return context