From 6ab25da5c7a413bfcc08d4090ea307966a63e57c Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 7 Sep 2020 11:16:54 +0000 Subject: [PATCH] add 'show only jobs with active members'; add 'hide subitem if no members' --- fet2020/posts/views.py | 7 ++++--- fet2020/templates/members/jobs_list.html | 24 ++++++++++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index b8d7a0fb..95af1ae0 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -43,9 +43,10 @@ def tags(request, tag=""): active_members = JobMember.active_member.get_members_of_job(job_names=job_names) for idx, item in enumerate(job_names): - members.append( - (job_names[idx], active_members[idx], tag + "#" + slug_list[idx]) - ) + if active_members[idx]: + members.append( + (job_names[idx], active_members[idx], tag + "#" + slug_list[idx]) + ) context = { "posts": posts, diff --git a/fet2020/templates/members/jobs_list.html b/fet2020/templates/members/jobs_list.html index cb9f680e..db5acb90 100644 --- a/fet2020/templates/members/jobs_list.html +++ b/fet2020/templates/members/jobs_list.html @@ -1,10 +1,18 @@ -Aktuelle Mitglieder: -{% with job_memberships=active_members %} - {% include 'members/partials/_job_membership_grid.html' %} -{% endwith %} +{% if active_members %} -Vergangene Mitglieder: -{% with job_memberships=inactive_members %} - {% include 'members/partials/_job_membership_grid.html' %} -{% endwith %} + Aktuelle Mitglieder: + {% with job_memberships=active_members %} + {% include 'members/partials/_job_membership_grid.html' %} + {% endwith %} + +{% endif %} + +{% if inactive_members %} + + Vergangene Mitglieder: + {% with job_memberships=inactive_members %} + {% include 'members/partials/_job_membership_grid.html' %} + {% endwith %} + +{% endif %}