|
53 | 53 |
|
54 | 54 | def fill_in_charter_info(group, include_drafts=False): |
55 | 55 | group.areadirector = group.ad.role_email("ad", group.parent) if group.ad else None |
56 | | - group.chairs = Email.objects.filter(role__group=group, role__name="chair") |
57 | | - group.techadvisors = Email.objects.filter(role__group=group, role__name="techadv") |
58 | | - group.editors = Email.objects.filter(role__group=group, role__name="editor") |
59 | | - group.secretaries = Email.objects.filter(role__group=group, role__name="secr") |
| 56 | + group.chairs = Email.objects.filter(role__group=group, role__name="chair").select_related("person") |
| 57 | + group.techadvisors = Email.objects.filter(role__group=group, role__name="techadv").select_related("person") |
| 58 | + group.editors = Email.objects.filter(role__group=group, role__name="editor").select_related("person") |
| 59 | + group.secretaries = Email.objects.filter(role__group=group, role__name="secr").select_related("person") |
60 | 60 | milestone_state = "charter" if group.state_id == "proposed" else "active" |
61 | 61 | group.milestones = group.groupmilestone_set.filter(state=milestone_state).order_by('due') |
62 | 62 |
|
@@ -275,7 +275,7 @@ def group_charter(request, acronym): |
275 | 275 | group = get_object_or_404(Group, type="wg", acronym=acronym) |
276 | 276 |
|
277 | 277 | fill_in_charter_info(group, include_drafts=False) |
278 | | - group.delegates = Email.objects.filter(role__group=group, role__name="delegate") |
| 278 | + group.delegates = Email.objects.filter(role__group=group, role__name="delegate").select_related("person") |
279 | 279 |
|
280 | 280 | e = group.latest_event(type__in=("changed_state", "requested_close",)) |
281 | 281 | requested_close = group.state_id != "conclude" and e and e.type == "requested_close" |
|
0 commit comments