fix get job_groups
This commit is contained in:
@@ -8,7 +8,7 @@ from django.utils import timezone
|
||||
class ActiveJobMemberManager(models.Manager):
|
||||
"""return a list of active member, and members who are still working."""
|
||||
|
||||
def get_all_by_slug(self, slug):
|
||||
def get_all(self, slug):
|
||||
return (
|
||||
self.get_queryset()
|
||||
.filter(job__job_group__slug=slug)
|
||||
@@ -27,7 +27,7 @@ class ActiveJobMemberManager(models.Manager):
|
||||
class InactiveJobMemberManager(models.Manager):
|
||||
"""return a list of inactive member."""
|
||||
|
||||
def get_all_by_slug(self, slug):
|
||||
def get_all(self, slug):
|
||||
return (
|
||||
self.get_queryset()
|
||||
.filter(job__job_group__slug=slug)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
from collections import deque
|
||||
import logging
|
||||
|
||||
from django.http import Http404
|
||||
@@ -9,11 +10,11 @@ logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def __get_job_groups():
|
||||
job_groups = list(JobGroup.objects.all())
|
||||
job_groups = deque(JobGroup.objects.all())
|
||||
|
||||
# remove job group if there is no longer an active member
|
||||
for elem in job_groups:
|
||||
job_members = JobMember.active_member.get_all_by_slug(slug=elem.slug)
|
||||
for elem in job_groups.copy():
|
||||
job_members = JobMember.active_member.get_all(slug=elem.slug)
|
||||
if not job_members:
|
||||
job_groups.remove(elem)
|
||||
|
||||
@@ -41,7 +42,7 @@ def jobs(request, slug=None):
|
||||
logger.info("Wrong job '{}'".format(slug))
|
||||
raise Http404("wrong job")
|
||||
|
||||
job_members = JobMember.active_member.get_all_by_slug(slug=slug)
|
||||
job_members = JobMember.active_member.get_all(slug=slug)
|
||||
active_job_group = JobGroup.objects.filter(slug=slug).first()
|
||||
|
||||
context = {
|
||||
|
||||
Reference in New Issue
Block a user