Merge pull request #799 from uchicago-library/798-move-inactive-group…

…s-to-a-separate-page Move Inactive Groups to a Separate Page
uchicago-library · Jan 15, 2025 · f4e51a4 · f4e51a4
2 parents 44f9918 + 6273e87
commit f4e51a4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 29 deletions.
diff --git a/base/fixtures/test.json b/base/fixtures/test.json
diff --git a/group/models.py b/group/models.py
@@ -580,8 +580,11 @@ class GroupIndexPage(BasePage):
     Receptacle page for holding groups.
     """
 
-    max_count = 1
-    subpage_types = ['group.GroupPage']
+    subpage_types = [
+        'group.GroupPage',
+        'group.GroupIndexPage',
+        'base.IntranetPlainPage',
+    ]
     intro = RichTextField()
 
     content_panels = (
@@ -597,8 +600,8 @@ def get_context(self, request):
 
         groups_active = [
             {
-                'title': GroupIndexPage.objects.first().title,
-                'url': GroupIndexPage.objects.first().url,
+                'title': self.title,
+                'url': self.url,
                 'children': [],
             }
         ]
@@ -609,10 +612,12 @@ def get_context(self, request):
         # create it. Then continue on, one descendant at a time, either adding
         # new levels or using the existing ones if they're already there
         # from previous group pages.
-        for grouppage in GroupPage.objects.live().filter(is_active=True):
+        for grouppage in (
+            GroupPage.objects.live().child_of(self).filter(is_active=True)
+        ):
             ancestors = (
-                [GroupIndexPage.objects.first()]
-                + list(GroupPage.objects.ancestor_of(grouppage))
+                [self]
+                + list(GroupPage.objects.descendant_of(grouppage))
                 + [grouppage]
             )
             currentlevel = groups_active
@@ -669,7 +674,10 @@ def get_html(currentlevel):
         context['groups_inactive'] = list(
             map(
                 lambda g: {'title': g.title, 'url': g.url},
-                GroupPage.objects.live().filter(is_active=False).order_by('title'),
+                GroupPage.objects.live()
+                .child_of(self)
+                .filter(is_active=False)
+                .order_by('title'),
             )
         )
         return context
diff --git a/group/templates/group/group_index_page.html b/group/templates/group/group_index_page.html
@@ -4,26 +4,28 @@
 {% block body_class %}template-{{ self.get_verbose_name|slugify }}{% endblock %}
 
 {% block content %}
-  <div class="row-fluid">
-    <div class="col-xs-12 col-sm-12 col-md-12 swnews">
-      <article>
-        <h1>{{ self.title }}</h1>
-
-        {{ self.intro|richtext }}
-
-        <div class="grouplist">
-          {{ groups_active_html|richtext }}
-        </div>
-
-        <h2>Inactive Groups</h2>
-        <div class="inactive-groups">
-          <ul>
-            {% for group in groups_inactive %}
-              <li><a href="{{ group.url }}">{{ group.title }}</a></li>
-            {% endfor %}
-          </ul>
+    <div class="row-fluid">
+        <div class="col-xs-12 col-sm-12 col-md-12 swnews">
+            <article>
+                <h1>{{ self.title }}</h1>
+
+                {{ self.intro|richtext }}
+
+                <div class="grouplist">
+                    {{ groups_active_html|richtext }}
+                </div>
+
+                {% if groups_inactive %}
+                    <h2>Inactive Groups</h2>
+                    <div class="inactive-groups">
+                        <ul>
+                            {% for group in groups_inactive %}
+                                <li><a href="{{ group.url }}">{{ group.title }}</a></li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                {% endif %}
+            </article>
         </div>
-      </article>
     </div>
-  </div>
 {% endblock %}