Merged in [18296] from rjsparks@nostrum.com:

    Show RSOC from the Group menu. Fixes ietf-tools#3024.
 - Legacy-Id: 18308
Note: SVN reference [18296] has been migrated to Git commit 328c92f

Author: levkowetz

ietf/doc/templatetags/active_groups_menu.py

@@ -1,16 +1,25 @@
+# Copyright The IETF Trust 2015-2020, All Rights Reserved
 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)) # type: ignore
+    # 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 })
 

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>