Compress flagged packages on the dashboard

devel/views.py

@@ -25,6 +25,7 @@
 from django.views.decorators.cache import cache_control, never_cache
 
 from main.models import Arch, Package, Repo
+from main.utils import groupby_preserve_order
 from news.models import News
 from packages.models import FlagRequest, PackageRelation, Signoff
 from packages.utils import get_signoff_groups
@@ -46,9 +47,14 @@ def index(request):
         inner_q = PackageRelation.objects.none()
     inner_q = inner_q.values('pkgbase')
 
-    flagged = Package.objects.normal().filter(
+    # select all flagged packages by pkgname
+    flagged_all = Package.objects.normal().filter(
         flag_date__isnull=False, pkgbase__in=inner_q).order_by('pkgname')
 
+    # group flagged packages by pkgbase
+    same_pkgbase_key = lambda x: (x.repo.name, x.arch.name, x.pkgbase)
+    flagged = groupby_preserve_order(flagged_all, same_pkgbase_key)
+
     todopkgs = TodolistPackage.objects.select_related(
         'todolist', 'pkg', 'arch', 'repo').exclude(
             status=TodolistPackage.COMPLETE).filter(removed__isnull=True)

templates/devel/index.html

@@ -26,19 +26,26 @@ <h3>My Flagged Packages</h3>
             </tr>
         </thead>
         <tbody>
-            {% for pkg in flagged %}
-                <tr>
-                    <td>{% pkg_details_link pkg %}</td>
-                    <td>{{ pkg.full_version }}</td>
-                    <td>{% with pkg.in_testing as tp %}{% if tp %}
-                        <a href="{{ tp.get_absolute_url }}"
-                            title="Testing package details for {{ tp.pkgname }}">{{ tp.full_version }}</a>
-                        {% endif %}{% endwith %}</td>
-                    <td>{{ pkg.repo.name }}</td>
-                    <td>{{ pkg.arch.name }}</td>
-                    <td>{{ pkg.flag_date|date:"Y-m-d" }}</td>
-                    <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
-                </tr>
+            {% for splitpkg in flagged %}
+                {% with splitpkg|first as pkg %}
+                    <tr>
+                        <td>
+                            {% pkg_details_link splitpkg.0 %}
+                            {% if splitpkg|length > 1 %}
+                                ({{ splitpkg|length }} split packages)
+                            {% endif %}
+                        </td>
+                        <td>{{ pkg.full_version }}</td>
+                        <td>{% with pkg.in_testing as tp %}{% if tp %}
+                            <a href="{{ tp.get_absolute_url }}"
+                                title="Testing package details for {{ tp.pkgname }}">{{ tp.full_version }}</a>
+                            {% endif %}{% endwith %}</td>
+                        <td>{{ pkg.repo.name }}</td>
+                        <td>{{ pkg.arch.name }}</td>
+                        <td>{{ pkg.flag_date|date:"Y-m-d" }}</td>
+                        <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
+                    </tr>
+                {% endwith %}
             {% empty %}
                 <tr class="empty"><td colspan="7"><em>No flagged packages to display</em></td></tr>
             {% endfor %}