fix: Do not include concluded WGs in /list/nonwg. Fixes ietf-tools#3726. (ietf-tools#3727)

Author: russhousley

ietf/mailinglists/tests.py

@@ -32,7 +32,13 @@ def test_groups(self):
 
 
     def test_nonwg(self):
+        groups = list()
+        groups.append(GroupFactory(type_id='wg', acronym='mars', list_archive='https://ietf.org/mars'))
+        groups.append(GroupFactory(type_id='wg', acronym='ames', state_id='conclude', list_archive='https://ietf.org/ames'))
+        groups.append(GroupFactory(type_id='wg', acronym='newstuff', state_id='bof', list_archive='https://ietf.org/newstuff'))
+        groups.append(GroupFactory(type_id='rg', acronym='research', list_archive='https://irtf.org/research'))
         lists = ListFactory.create_batch(7)
+
         url = urlreverse("ietf.mailinglists.views.nonwg")
 
         r = self.client.get(url)
@@ -43,3 +49,6 @@ def test_nonwg(self):
             else:
                 self.assertNotContains(r, l.name, html=True)
                 self.assertNotContains(r, l.description, html=True)
+
+        for g in groups:
+            self.assertNotContains(r, g.acronym, html=True)

ietf/mailinglists/views.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2007-2022, All Rights Reserved
 
 import re
 
@@ -15,7 +15,7 @@ def groups(request):
     return render(request, "mailinglists/group_archives.html", { "groups": groups } )
 
 def nonwg(request):
-    groups = Group.objects.filter(type__features__acts_like_wg=True).exclude(state__in=['bof', 'conclude']).order_by("acronym")
+    groups = Group.objects.filter(type__features__acts_like_wg=True).exclude(state__in=['bof']).order_by("acronym")
 
     #urls = [ g.list_archive for g in groups if '.ietf.org' in g.list_archive ]