fix: restore attendee dbtemplate for old meetings pending data correction (#6656)
* fix: restore attendee dbtemplate for old meetings pending data correction * test: adjust attendees test to match workaround
This commit is contained in:
parent
1f47d0a159
commit
c1627ed011
|
@ -7856,7 +7856,7 @@ class ProceedingsTests(BaseMeetingTestCase):
|
|||
"""
|
||||
|
||||
make_meeting_test_data()
|
||||
meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016, 7, 14), number="97")
|
||||
meeting = MeetingFactory(type_id='ietf', date=datetime.date(2023, 11, 4), number="118")
|
||||
person_a = PersonFactory(name='Person A')
|
||||
person_b = PersonFactory(name='Person B')
|
||||
person_c = PersonFactory(name='Person C')
|
||||
|
@ -7868,7 +7868,7 @@ class ProceedingsTests(BaseMeetingTestCase):
|
|||
MeetingRegistrationFactory(meeting=meeting, person=person_c, reg_type='remote')
|
||||
AttendedFactory(session__meeting=meeting, session__type_id='plenary', person=person_c)
|
||||
MeetingRegistrationFactory(meeting=meeting, person=person_d, reg_type='remote')
|
||||
url = urlreverse('ietf.meeting.views.proceedings_attendees',kwargs={'num': 97})
|
||||
url = urlreverse('ietf.meeting.views.proceedings_attendees',kwargs={'num': 118})
|
||||
response = self.client.get(url)
|
||||
self.assertContains(response, 'Attendee list')
|
||||
q = PyQuery(response.content)
|
||||
|
|
|
@ -3861,6 +3861,10 @@ def proceedings_attendees(request, num=None):
|
|||
if meeting.proceedings_format_version == 1:
|
||||
return HttpResponseRedirect(f'{settings.PROCEEDINGS_V1_BASE_URL.format(meeting=meeting)}/attendee.html')
|
||||
|
||||
template = None
|
||||
meeting_registrations = None
|
||||
|
||||
if int(meeting.number) >= 118:
|
||||
checked_in, attended = participants_for_meeting(meeting)
|
||||
regs = list(MeetingRegistration.objects.filter(meeting__number=num, reg_type='onsite', checkedin=True))
|
||||
|
||||
|
@ -3869,10 +3873,17 @@ def proceedings_attendees(request, num=None):
|
|||
regs.append(mr)
|
||||
|
||||
meeting_registrations = sorted(regs, key=lambda x: (x.last_name, x.first_name))
|
||||
else:
|
||||
overview_template = "/meeting/proceedings/%s/attendees.html" % meeting.number
|
||||
try:
|
||||
template = render_to_string(overview_template, {})
|
||||
except TemplateDoesNotExist:
|
||||
raise Http404
|
||||
|
||||
return render(request, "meeting/proceedings_attendees.html", {
|
||||
'meeting': meeting,
|
||||
'meeting_registrations': meeting_registrations,
|
||||
'template': template,
|
||||
})
|
||||
|
||||
def proceedings_overview(request, num=None):
|
||||
|
|
|
@ -15,6 +15,9 @@
|
|||
</h1>
|
||||
<h2>Attendee list of IETF {{ meeting.number }} meeting</h2>
|
||||
|
||||
{% if template %}
|
||||
{{template|safe}}
|
||||
{% else %}
|
||||
<table id="id_attendees" class="table table-sm table-striped tablesorter">
|
||||
<thead>
|
||||
<tr>
|
||||
|
@ -37,7 +40,7 @@
|
|||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
{% block js %}
|
||||
<script src="{% static "ietf/js/list.js" %}"></script>
|
||||
|
|
Loading…
Reference in a new issue