Tweak a bunch of things

JelteF · JelteF · commit 8b0b7cb96d62 · 2025-03-02T22:34:00.000+01:00
diff --git a/pgcommitfest/commitfest/templates/home.html b/pgcommitfest/commitfest/templates/home.html
@@ -48,13 +48,15 @@
     </tbody>
     </table>
    {%endif%}
-   <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
+   <h3>{{user.is_authenticated|yesno:"Your personal dashboard,Patches in the current commitfest"}}</h3>
    <table class="table table-striped table-bordered table-hover table-condensed">
     <thead>
      <tr>
       <th><a href="#" style="color:#333333;" onclick="return sortpatches(5);">Patch</a>{%if sortkey == 5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -5%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
       <th><a href="#" style="color:#333333;" onclick="return sortpatches(4);">ID</a>{%if sortkey == 4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -4%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
-      <th><a href="#" style="color:#333333;" onclick="return sortpatches(8);">CF</a>{%if sortkey == 8%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -8%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      {%if user.is_authenticated %}
+       <th><a href="#" style="color:#333333;" onclick="return sortpatches(8);">CF</a>{%if sortkey == 8%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -8%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
+      {%endif%}
       <th>Status</th>
       <th>Ver</th>
       <th><a href="#" style="color:#333333;" onclick="return sortpatches(7);">CI status</a>{%if sortkey == 7%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-down"></i></div>{%elif sortkey == -7%}<div style="float:right;"><i class="glyphicon glyphicon-arrow-up"></i></div>{%endif%}</th>
@@ -74,13 +76,15 @@ <h3>{{p.is_open|yesno:"Active patches,Closed patches"}}</h3>
 
   {%if grouping%}
    {%ifchanged p.topic%}
-    <tr><th colspan="{%if user.is_staff%}11{%else%}10{%endif%}">{{p.topic}}</th></tr>
+    <tr><th colspan="{%if user.is_staff%}13{%elif user.is_authenticated %}12{%else%}11{%endif%}">{{p.topic}}</th></tr>
    {%endifchanged%}
   {%endif%}
   <tr>
    <td><a href="/patch/{{p.id}}/">{{p.name}}</a></td>
    <td>{{p.id}}</td>
-   <td><a href="/{{p.cf_id}}/"><span class="label label-{{p.cf_status|commitfeststatuslabel}}">{{p.cf_name}}</span></a></td>
+   {%if user.is_authenticated %}
+    <td><a href="/{{p.cf_id}}/"><span class="label label-{{p.cf_status|commitfeststatuslabel}}">{{p.cf_name}}</span></a></td>
+   {%endif%}
    <td><span class="label label-{{p.status|patchstatuslabel}}">{{p.status|patchstatusstring}}</span></td>
    <td>{%if p.targetversion%}<span class="label label-default">{{p.targetversion}}</span>{%endif%}</td>
    <td class="cfbot-summary">
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
@@ -311,7 +311,7 @@ def patchlist(request, cf, personalized=False):
                 ) AND (
                     poc.status=ANY(%(review_statuses)s)
                 )
-            THEN 'Patches you might want to review'
+            THEN 'Patches that are ready for your review'
             ELSE 'Blocked on others'
             END AS topic,
             cf.id AS cf_id,
@@ -377,9 +377,24 @@ def patchlist(request, cf, personalized=False):
         orderby_str = "poc.commitfest_id DESC, lastmail"
     else:
         if personalized:
-            orderby_str = (
-                "topic DESC, branch.failing_since NULLS FIRST, cf.id, lastmail DESC"
-            )
+            # First we sort by topic, to have the grouping work.
+            # Then we show non-failing patches first, and the ones that are
+            # shortest failing we show first. We consider patches in a closed
+            # commitfest, as if they are failing since that commitfest was
+            # closed.
+            # Then we sort by start date of the CF, to show entries in the "In
+            # progress" commitfest before ones in the "Open" commitfest.
+            # And then to break ties, we put ones with the most recent email at
+            # the top.
+            orderby_str = """topic DESC,
+                COALESCE(
+                    branch.failing_since,
+                    CASE WHEN cf.status = %(cf_closed_status)s
+                    THEN enddate ELSE NULL END
+                ) DESC NULLS FIRST,
+                cf.startdate,
+                lastmail DESC"""
+            whereparams["cf_closed_status"] = CommitFest.STATUS_CLOSED
         else:
             orderby_str = "topic, created"
         sortkey = 0
