diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html index 98745b3b..ec758048 100644 --- a/fet2020/templates/members/index.html +++ b/fet2020/templates/members/index.html @@ -106,13 +106,13 @@ {% endblock member_content %} {% endif %} - {% if members %} + {% if member_list %} {% block members_content %} {% endblock members_content %} {% endif %} - {% if job_members %} + {% if jobmember_list %} {% block jobs_content %} {% endblock jobs_content %} diff --git a/fet2020/templates/members/jobs.html b/fet2020/templates/members/jobs.html index 4fc76b65..9d53aa46 100644 --- a/fet2020/templates/members/jobs.html +++ b/fet2020/templates/members/jobs.html @@ -5,15 +5,15 @@ {% block jobs_content %}

{{ active_job_group.name }}

- {% if description %} - {{ description|safe }} + {% if active_job_group.description %} + {{ active_job_group.description|safe }} {% endif %}
- {% regroup job_members by job.name as all_jobmem_list %} + {% regroup jobmember_list by job.name as jobmem_list %} - {% for jobmem in all_jobmem_list %} + {% for jobmem in jobmem_list %}
diff --git a/fet2020/templates/members/members.html b/fet2020/templates/members/members.html index cc4d5c07..471b2156 100644 --- a/fet2020/templates/members/members.html +++ b/fet2020/templates/members/members.html @@ -14,7 +14,7 @@