Allow filtering by multiple tags at once

Author: JelteF

pgcommitfest/commitfest/forms.py

@@ -19,7 +19,7 @@ class CommitFestFilterForm(forms.Form):
     text = forms.CharField(max_length=50, required=False)
     status = forms.ChoiceField(required=False)
     targetversion = forms.ChoiceField(required=False)
-    tag = forms.ChoiceField(required=False, label="Tag (type to search)")
+    tag = forms.MultipleChoiceField(required=False, label="Tag (type to search)")
     author = forms.ChoiceField(required=False, label="Author (type to search)")
     reviewer = forms.ChoiceField(required=False, label="Reviewer (type to search)")
     sortkey = forms.IntegerField(required=False)
@@ -61,9 +61,7 @@ def __init__(self, data, *args, **kwargs):
         )
         self.fields["author"].choices = userchoices
         self.fields["reviewer"].choices = userchoices
-        self.fields["tag"].choices = [(-1, "* All"), (-2, "* None")] + list(
-            Tag.objects.all().values_list("id", "name")
-        )
+        self.fields["tag"].choices = list(Tag.objects.all().values_list("id", "name"))
 
         for f in (
             "status",

pgcommitfest/commitfest/views.py

@@ -285,20 +285,16 @@ def patchlist(request, cf, personalized=False):
                 # int() failed, ignore
                 pass
 
-    if request.GET.get("tag", "-1") != "-1":
-        if request.GET["tag"] == "-2":
-            whereclauses.append(
-                "NOT EXISTS (SELECT 1 FROM commitfest_patch_tags tags WHERE tags.patch_id=p.id)"
-            )
-        else:
-            try:
-                whereparams["tag"] = int(request.GET["tag"])
+    if request.GET.getlist("tag") != []:
+        try:
+            tag_ids = [int(t) for t in request.GET.getlist("tag")]
+            for tag_id in tag_ids:
                 whereclauses.append(
-                    "EXISTS (SELECT 1 FROM commitfest_patch_tags tags WHERE tags.patch_id=p.id AND tags.tag_id=%(tag)s)"
+                    f"EXISTS (SELECT 1 FROM commitfest_patch_tags tags WHERE tags.patch_id=p.id AND tags.tag_id={tag_id})"
                 )
-            except ValueError:
-                # int() failed -- so just ignore this filter
-                pass
+        except ValueError:
+            # int() failed -- so just ignore this filter
+            pass
 
     if request.GET.get("author", "-1") != "-1":
         if request.GET["author"] == "-2":