Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ietf/liaisons/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@ def test_help_pages(self):
self.assertEqual(self.client.get('/liaison/help/from_ietf/').status_code, 200)
self.assertEqual(self.client.get('/liaison/help/to_ietf/').status_code, 200)

def test_list_other_sdo(self):
GroupFactory(type_id="sdo", state_id="conclude", acronym="third")
GroupFactory(type_id="sdo", state_id="active", acronym="second")
GroupFactory(type_id="sdo", state_id="active", acronym="first")
url = urlreverse("ietf.liaisons.views.list_other_sdo")
login_testing_unauthorized(self, "secretary", url)
r = self.client.get(url)
q = PyQuery(r.content)
self.assertEqual(len(q("h1")), 2)
first_td_elements_text = [e.text for e in q("tr").find("td:first-child")]
self.assertEqual(first_td_elements_text, ["first", "second", "third"])

class UnitTests(TestCase):
def test_get_contacts_for_liaison_messages_for_group_primary(self):
Expand Down
1 change: 1 addition & 0 deletions ietf/liaisons/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@
url(r'^add/$', views.redirect_add),
url(r'^for_approval/$', views.redirect_for_approval),
url(r'^for_approval/(?P<object_id>\d+)/$', views.redirect_for_approval),
url(r"^list_other_sdo/$", views.list_other_sdo),
]
14 changes: 14 additions & 0 deletions ietf/liaisons/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,3 +509,17 @@ def liaison_resend(request, object_id):
messages.success(request,'Liaison Statement resent')
return redirect('ietf.liaisons.views.liaison_list')


@role_required("Secretariat", "IAB", "Liaison Coordinator", "Liaison Manager")
def list_other_sdo(request):
def _sdo_order_key(obj:Group)-> tuple[str,str]:
state_order = {
"active" : "a",
"conclude": "b",
}
return (state_order.get(obj.state.slug,f"c{obj.state.slug}"), obj.acronym)

sdos = sorted(list(Group.objects.filter(type="sdo")),key = _sdo_order_key)
for sdo in sdos:
sdo.liaison_managers =[r.person for r in sdo.role_set.filter(name="liaiman")]
return render(request,"liaisons/list_other_sdo.html",dict(sdos=sdos))
Loading
Loading