removed sortorder field; multiple fields can be sorted together now

Author: destrex271

media/commitfest/js/commitfest.js

@@ -257,17 +257,13 @@ function flagCommitted(committer) {
 }
 
 function sortpatches(sortby) {
-   if ($('#id_sortkey').val() == sortby) {
-      if($('#id_sortorder').val() == 1){
-        $('#id_sortkey').val(0);
-        $('#id_sortorder').val(0); // reset order
-      }else if($('#id_sortorder').val() == -1){
-        $('#id_sortkey').val(sortby);
-        $('#id_sortorder').val(1); // ascending order -> oldest first
-      }
+   let sortkey = $('#id_sortkey').val()
+   if (sortkey == sortby) {
+      $('#id_sortkey').val(-sortby)
+   } else if(-sortkey == sortby){
+      $('#id_sortkey').val(0)
    } else {
       $('#id_sortkey').val(sortby);
-      $('#id_sortorder').val(-1); // descending order -> latest first
    }
    $('#filterform').submit();
 

pgcommitfest/commitfest/forms.py

@@ -17,13 +17,11 @@ class CommitFestFilterForm(forms.Form):
     author = forms.ChoiceField(required=False)
     reviewer = forms.ChoiceField(required=False)
     sortkey = forms.IntegerField(required=False)
-    sortorder = forms.IntegerField(required=False) # 0 -> no order, 1 -> asc, -1 -> desc
 
     def __init__(self, cf, *args, **kwargs):
         super(CommitFestFilterForm, self).__init__(*args, **kwargs)
 
         self.fields["sortkey"].widget = forms.HiddenInput()
-        self.fields["sortorder"].widget = forms.HiddenInput()
 
         c = [(-1, "* All")] + list(PatchOnCommitFest._STATUS_CHOICES)
         self.fields["status"] = forms.ChoiceField(choices=c, required=False)

pgcommitfest/commitfest/views.py

@@ -242,30 +242,39 @@ def commitfest(request, cfid):
 
         if sortkey == 1:
             orderby_str = "modified, created"
+        elif sortkey == -1:
+            orderby_str = "modified DESC, created DESC"
         elif sortkey == 2:
             orderby_str = "lastmail, created"
+        elif sortkey == -2:
+            orderby_str = "lastmail DESC, created DESC"
         elif sortkey == 3:
             orderby_str = "num_cfs DESC, modified, created"
+        elif sortkey == -3:
+            orderby_str = "num_cfs ASC, modified DESC, created DESC"
         elif sortkey == 4:
             orderby_str = "p.id"
+        elif sortkey == -4:
+            orderby_str = "p.id DESC"
         elif sortkey == 5:
             orderby_str = "p.name, created"
+        elif sortkey == -5:
+            orderby_str = "p.name DESC, created DESC"
         elif sortkey == 6:
             orderby_str = (
                 "branch.all_additions + branch.all_deletions NULLS LAST, created"
             )
+        elif sortkey == -6:
+            orderby_str = (
+                "branch.all_additions + branch.all_deletions DESC NULLS LAST, created"
+            )
         else:
             orderby_str = "p.id"
             sortkey = 0
     else:
         orderby_str = "topic, created"
         sortkey = 0
 
-    sortorder = int(request.GET.get("sortorder", "0"))
-    if sortorder == 1:
-        orderby_str += " ASC"
-    elif sortorder == -1:
-        orderby_str += " DESC"
 
     if not has_filter and sortkey == 0 and request.GET:
         # Redirect to get rid of the ugly url
@@ -353,7 +362,6 @@ def commitfest(request, cfid):
             "title": cf.title,
             "grouping": sortkey == 0,
             "sortkey": sortkey,
-            "sortorder": sortorder,
             "openpatchids": [p["id"] for p in patches if p["is_open"]],
             "header_activity": "Activity log",
             "header_activity_link": "activity/",