feat: include proposed WGs on meeting requests page (#4551)
This commit is contained in:
parent
6cc2fb94a3
commit
0bdfb25c47
|
@ -6506,6 +6506,14 @@ class SessionTests(TestCase):
|
|||
status_id='schedw',
|
||||
add_to_schedule=False,
|
||||
)
|
||||
# proposed WG sessions should be shown
|
||||
proposed_wg_session = SessionFactory(
|
||||
meeting=meeting,
|
||||
group__parent=area,
|
||||
group__state_id='proposed',
|
||||
status_id='schedw',
|
||||
add_to_schedule=False,
|
||||
)
|
||||
# rg sessions should be shown under 'irtf' heading
|
||||
rg_session = SessionFactory(
|
||||
meeting=meeting,
|
||||
|
@ -6547,6 +6555,8 @@ class SessionTests(TestCase):
|
|||
self.assertNotContains(r, _sreq_edit_link(not_has_meetings)) # no link to the session request
|
||||
self.assertContains(r, bof_session.group.acronym)
|
||||
self.assertContains(r, _sreq_edit_link(bof_session)) # link to the session request
|
||||
self.assertContains(r, proposed_wg_session.group.acronym)
|
||||
self.assertContains(r, _sreq_edit_link(proposed_wg_session)) # link to the session request
|
||||
self.assertContains(r, rg_session.group.acronym)
|
||||
self.assertContains(r, _sreq_edit_link(rg_session)) # link to the session request
|
||||
# check headings - note that the special types (has_meetings, etc) do not have a group parent
|
||||
|
|
|
@ -2321,7 +2321,7 @@ def agenda_json(request, num=None):
|
|||
def meeting_requests(request, num=None):
|
||||
meeting = get_meeting(num)
|
||||
groups_to_show = Group.objects.filter(
|
||||
state_id__in=('active', 'bof'),
|
||||
state_id__in=('active', 'bof', 'proposed'),
|
||||
type__features__has_meetings=True,
|
||||
)
|
||||
sessions = list(
|
||||
|
|
|
@ -68,8 +68,8 @@
|
|||
<i class="bi bi-people-fill"></i> {{ session.attendees }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if session.group.is_bof %}
|
||||
<span class="badge bg-success float-end">BOF</span>
|
||||
{% if session.group.state.slug != "active" %}
|
||||
<br><span class="badge bg-success">{{ session.group.state.name }}</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="d-none d-lg-table-cell">
|
||||
|
|
Loading…
Reference in a new issue