diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index 6f02b16e29..bad1ec4a1f 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -1313,14 +1313,16 @@ def eligible(request, year, public=False): def public_volunteers(request, year): return volunteers(request=request, year=year, public=True) -def private_volunteers(request, year): - return volunteers(request=request, year=year, public=False) - +def private_volunteers(request, year, mode="full"): + return volunteers(request=request, year=year, public=False, mode=mode) @role_required("Nomcom Chair", "Nomcom Advisor", "Secretariat") -def volunteers(request, year, public=False): +def volunteers(request, year, public=False, mode="full"): nomcom, volunteers = extract_volunteers(year) - return render(request, 'nomcom/volunteers.html', dict(year=year, nomcom=nomcom, volunteers=volunteers, public=public)) + fullmode = 1 + if mode != "full": + fullmode=0 + return render(request, 'nomcom/volunteers.html', dict(year=year, nomcom=nomcom, volunteers=volunteers, public=public, fullmode=fullmode)) @role_required("Nomcom Chair", "Nomcom Advisor", "Secretariat") def private_volunteers_csv(request, year, public=False): diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html index 2a0495fbe6..b6089f2887 100644 --- a/ietf/templates/nomcom/nomcom_private_base.html +++ b/ietf/templates/nomcom/nomcom_private_base.html @@ -126,13 +126,18 @@

@@ -153,4 +158,4 @@

window.location.hash=e.target.hash; }) -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/ietf/templates/nomcom/volunteers.html b/ietf/templates/nomcom/volunteers.html index 5cc437c23c..0c4339870f 100644 --- a/ietf/templates/nomcom/volunteers.html +++ b/ietf/templates/nomcom/volunteers.html @@ -18,26 +18,30 @@

{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}< - Last name - First name Plain name - Profile page - Affiliation - Primary email - Qualifications + Affiliation + {% if fullmode %} + Last name + First name + Profile page + Primary email + Qualifications + {% endif %} {% for v in eligibility_group.list %} {{ forloop.counter }} - {{ v.person.last_name }} - {{ v.person.first_name }} {{ v.person.ascii_name }} - {% person_link v.person %} {{ v.affiliation }} - {{ v.person.email|linkify }} - {{ v.qualifications }} + {% if fullmode %} + {{ v.person.last_name }} + {{ v.person.first_name }} + {% person_link v.person %} + {{ v.person.email|linkify }} + {{ v.qualifications }} + {% endif %} {% endfor %} @@ -46,4 +50,4 @@

{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}< {% endblock %} {% block js %} -{% endblock %} \ No newline at end of file +{% endblock %}