From 328c92f3953a44ee5bf42c4ae1204c09e5c4139d Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Tue, 28 Jul 2020 16:10:42 +0000
Subject: [PATCH 1/2] Show RSOC from the Group menu. Fixes #3024. Commit ready
 for merge.  - Legacy-Id: 18296

---
 ietf/doc/templatetags/active_groups_menu.py | 11 +++++++++--
 ietf/templates/base/menu_active_groups.html |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ietf/doc/templatetags/active_groups_menu.py b/ietf/doc/templatetags/active_groups_menu.py
index 04ed116d4..17a265492 100644
--- a/ietf/doc/templatetags/active_groups_menu.py
+++ b/ietf/doc/templatetags/active_groups_menu.py
@@ -1,16 +1,23 @@
 from django import template
 from django.template.loader import render_to_string
+from django.urls import reverse
 
+from ietf.group.models import Group
 from ietf.name.models import GroupTypeName
 
 register = template.Library()
 
 parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','program'])
 
+others = []
+for group in Group.objects.filter(acronym__in=('rsoc',), state_id='active'):
+    group.menu_url = reverse('ietf.group.views.group_home', kwargs=dict(acronym=group.acronym)) # could use group.about_url() instead
+    others.append(group)
+
 @register.simple_tag
 def active_groups_menu():
-    global parents
+    global parents, others
     for p in parents:
         p.menu_url = '/%s/'%p.slug
-    return render_to_string('base/menu_active_groups.html', { 'parents': parents })
+    return render_to_string('base/menu_active_groups.html', { 'parents': parents, 'others': others })
 
diff --git a/ietf/templates/base/menu_active_groups.html b/ietf/templates/base/menu_active_groups.html
index 17a8cd033..d92f93336 100644
--- a/ietf/templates/base/menu_active_groups.html
+++ b/ietf/templates/base/menu_active_groups.html
@@ -5,4 +5,9 @@
     <a href="{{ p.menu_url }}">Active {{ p.name }}s</a>
   </li>
 {% endfor %}
+{% for o in others %}
+  <li>
+    <a href="{{o.menu_url}}">{{ o.acronym|upper }}</a>
+  </li>
+{% endfor %}
 </ul>

From 44d19f05336ccfca31cbf7bc05e606bad91fe0af Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Tue, 28 Jul 2020 16:49:08 +0000
Subject: [PATCH 2/2] Let MyPy know a decoration is on purpose. Commit ready
 for merge.  - Legacy-Id: 18297

---
 ietf/doc/templatetags/active_groups_menu.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ietf/doc/templatetags/active_groups_menu.py b/ietf/doc/templatetags/active_groups_menu.py
index 17a265492..575aa7662 100644
--- a/ietf/doc/templatetags/active_groups_menu.py
+++ b/ietf/doc/templatetags/active_groups_menu.py
@@ -11,7 +11,8 @@ parents = GroupTypeName.objects.filter(slug__in=['ag','area','team','dir','progr
 
 others = []
 for group in Group.objects.filter(acronym__in=('rsoc',), state_id='active'):
-    group.menu_url = reverse('ietf.group.views.group_home', kwargs=dict(acronym=group.acronym)) # could use group.about_url() instead
+    group.menu_url = reverse('ietf.group.views.group_home', kwargs=dict(acronym=group.acronym)) # type: ignore
+    # could use group.about_url() instead
     others.append(group)
 
 @register.simple_tag