Allow filtering by tags

Author: JelteF

pgcommitfest/commitfest/forms.py

@@ -5,19 +5,21 @@
 from django.http import Http404
 
 from .ajax import _archivesAPI
-from .models import MailThread, Patch, PatchOnCommitFest, TargetVersion
+from .models import MailThread, Patch, PatchOnCommitFest, Tag, TargetVersion
 from .widgets import ThreadPickWidget
 
 
 class CommitFestFilterForm(forms.Form):
     selectize_fields = {
         "author": "/lookups/user",
         "reviewer": "/lookups/user",
+        "tag": None,
     }
 
     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)")
     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)
@@ -59,6 +61,9 @@ 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")
+        )
 
         for f in (
             "status",

pgcommitfest/commitfest/views.py

@@ -263,6 +263,21 @@ 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"])
+                whereclauses.append(
+                    "EXISTS (SELECT 1 FROM commitfest_patch_tags tags WHERE tags.patch_id=p.id AND tags.tag_id=%(tag)s)"
+                )
+            except ValueError:
+                # int() failed -- so just ignore this filter
+                pass
+
     if request.GET.get("author", "-1") != "-1":
         if request.GET["author"] == "-2":
             whereclauses.append(