{%with p.cfbot_results as cfb%}
diff --git a/pgcommitfest/commitfest/templates/patch.html b/pgcommitfest/commitfest/templates/patch.html
index b2a660e2..7fd12d3f 100644
--- a/pgcommitfest/commitfest/templates/patch.html
+++ b/pgcommitfest/commitfest/templates/patch.html
@@ -67,6 +67,14 @@
Topic
{{patch.topic}}
+
+
Tags
+
+ {%for tag in patch.tags.all%}
+ {{tag.name}}
+ {%endfor%}
+
+
Created
{{patch.created}}
diff --git a/pgcommitfest/commitfest/templates/selectize_js.html b/pgcommitfest/commitfest/templates/selectize_js.html
index 7cd5fb7d..0991ac65 100644
--- a/pgcommitfest/commitfest/templates/selectize_js.html
+++ b/pgcommitfest/commitfest/templates/selectize_js.html
@@ -5,19 +5,21 @@
valueField: 'id',
labelField: 'value',
searchField: 'value',
- load: function(query, callback) {
- if (!query.length) return callback();
- $.ajax({
- 'url': '{{url}}',
- 'type': 'GET',
- 'dataType': 'json',
- 'data': {
- 'query': query,
- },
- 'error': function() { callback();},
- 'success': function(res) { callback(res.values);},
- });
- },
+ {%if url%}
+ load: function(query, callback) {
+ if (!query.length) return callback();
+ $.ajax({
+ 'url': '{{url}}',
+ 'type': 'GET',
+ 'dataType': 'json',
+ 'data': {
+ 'query': query,
+ },
+ 'error': function() { callback();},
+ 'success': function(res) { callback(res.values);},
+ });
+ },
+ {%endif%}
onFocus: function() {
if (this.$input.is('[multiple]')) {
return;
diff --git a/pgcommitfest/commitfest/templatetags/commitfest.py b/pgcommitfest/commitfest/templatetags/commitfest.py
index 25fd21f2..5c6d22e9 100644
--- a/pgcommitfest/commitfest/templatetags/commitfest.py
+++ b/pgcommitfest/commitfest/templatetags/commitfest.py
@@ -6,6 +6,7 @@
from django.utils.translation import ngettext_lazy
import datetime
+import string
from uuid import uuid4
from pgcommitfest.commitfest.models import CommitFest, PatchOnCommitFest
@@ -41,6 +42,58 @@ def patchstatuslabel(value):
return [v for k, v in PatchOnCommitFest._STATUS_LABELS if k == i][0]
+@register.filter(name="tagname")
+def tagname(value, arg):
+ """
+ Looks up a tag by ID and returns its name. The filter value is the map of
+ tags, and the argument is the ID. (Unlike tagcolor, there is no
+ argument-less variant; just use tag.name directly.)
+
+ Example:
+ tag_map|tagname:tag_id
+ """
+ return value[arg].name
+
+
+@register.filter(name="tagdescription")
+def tagdescription(value, arg):
+ """
+ Looks up a tag by ID and returns its name. The filter value is the map of
+ tags, and the argument is the ID. (Unlike tagcolor, there is no
+ argument-less variant; just use tag.name directly.)
+
+ Example:
+ tag_map|tagname:tag_id
+ """
+ return value[arg].description
+
+
+@register.filter(name="tagcolor")
+def tagcolor(value, key=None):
+ """
+ Returns the color code of a tag. The filter value is either a single tag, in
+ which case no argument should be given, or a map of tags with the tag ID as
+ the argument, as with the tagname filter.
+
+ Since color codes are injected into CSS, any nonconforming inputs are
+ replaced with black here. (Prefer `tag|tagcolor` over `tag.color` in
+ templates, for this reason.)
+ """
+ if key is not None:
+ code = value[key].color
+ else:
+ code = value.color
+
+ if (
+ len(code) == 7
+ and code.startswith("#")
+ and all(c in string.hexdigits for c in code[1:])
+ ):
+ return code
+
+ return "#000000"
+
+
@register.filter(is_safe=True)
def label_class(value, arg):
return value.label_tag(attrs={"class": arg})
diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py
index 29bcb59a..4b3d12c8 100644
--- a/pgcommitfest/commitfest/views.py
+++ b/pgcommitfest/commitfest/views.py
@@ -42,6 +42,7 @@
Patch,
PatchHistory,
PatchOnCommitFest,
+ Tag,
UserInputError,
)
@@ -87,7 +88,13 @@ def help(request):
@login_required
+@transaction.atomic
def me(request):
+ curs = connection.cursor()
+ # Make sure the patchlist() query, the stats query and, Tag.objects.all()
+ # all work on the same snapshot. Needs to be first in the
+ # transaction.atomic decorator.
+ curs.execute("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ")
cfs = list(CommitFest.objects.filter(status=CommitFest.STATUS_INPROGRESS))
if len(cfs) == 0:
cfs = list(CommitFest.objects.filter(status=CommitFest.STATUS_OPEN))
@@ -107,7 +114,6 @@ def me(request):
return patch_list.redirect
# Get stats related to user for current commitfest
- curs = connection.cursor()
curs.execute(
"""SELECT
ps.status, ps.statusstring, count(*)
@@ -141,6 +147,7 @@ def me(request):
"title": "Personal Dashboard",
"patches": patch_list.patches,
"statussummary": statussummary,
+ "all_tags": {t.id: t for t in Tag.objects.all()},
"has_filter": patch_list.has_filter,
"grouping": patch_list.sortkey == 0,
"sortkey": patch_list.sortkey,
@@ -283,6 +290,21 @@ def patchlist(request, cf, personalized=False):
# int() failed, ignore
pass
+ if request.GET.getlist("tag") != []:
+ try:
+ tag_ids = [int(t) for t in request.GET.getlist("tag")]
+ for tag_id in tag_ids:
+ # Instead of using parameters, we just inline the tag_id. This
+ # is easier because we have can have multiple tags, and since
+ # tag_id is always an int it's safe with respect to SQL
+ # injection.
+ whereclauses.append(
+ 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
+
if request.GET.get("author", "-1") != "-1":
if request.GET["author"] == "-2":
whereclauses.append(
@@ -506,6 +528,7 @@ def patchlist(request, cf, personalized=False):
(SELECT string_agg(first_name || ' ' || last_name || ' (' || username || ')', ', ') FROM auth_user INNER JOIN commitfest_patch_authors cpa ON cpa.user_id=auth_user.id WHERE cpa.patch_id=p.id) AS author_names,
(SELECT string_agg(first_name || ' ' || last_name || ' (' || username || ')', ', ') FROM auth_user INNER JOIN commitfest_patch_reviewers cpr ON cpr.user_id=auth_user.id WHERE cpr.patch_id=p.id) AS reviewer_names,
(SELECT count(1) FROM commitfest_patchoncommitfest pcf WHERE pcf.patch_id=p.id) AS num_cfs,
+(SELECT array_agg(tag_id) FROM commitfest_patch_tags t WHERE t.patch_id=p.id) AS tag_ids,
branch.needs_rebase_since,
branch.failing_since,
@@ -552,7 +575,13 @@ def patchlist(request, cf, personalized=False):
)
+@transaction.atomic
def commitfest(request, cfid):
+ curs = connection.cursor()
+ # Make sure the patchlist() query, the stats query and, Tag.objects.all()
+ # all work on the same snapshot. Needs to be first in the
+ # transaction.atomic decorator.
+ curs.execute("SET TRANSACTION ISOLATION LEVEL REPEATABLE READ")
# Find ourselves
cf = get_object_or_404(CommitFest, pk=cfid)
@@ -561,7 +590,6 @@ def commitfest(request, cfid):
return patch_list.redirect
# Generate patch status summary.
- curs = connection.cursor()
curs.execute(
"SELECT ps.status, ps.statusstring, count(*) FROM commitfest_patchoncommitfest poc INNER JOIN commitfest_patchstatus ps ON ps.status=poc.status WHERE commitfest_id=%(id)s GROUP BY ps.status ORDER BY ps.sortkey",
{
@@ -583,6 +611,7 @@ def commitfest(request, cfid):
"form": form,
"patches": patch_list.patches,
"statussummary": statussummary,
+ "all_tags": {t.id: t for t in Tag.objects.all()},
"has_filter": patch_list.has_filter,
"title": cf.title,
"grouping": patch_list.sortkey == 0,
@@ -755,10 +784,14 @@ def patchform(request, patchid):
# Track all changes
for field, values in r.diff.items():
+ if field == "tags":
+ value = ", ".join(v.name for v in values[1])
+ else:
+ value = values[1]
PatchHistory(
patch=patch,
by=request.user,
- what="Changed %s to %s" % (field, values[1]),
+ what="Changed %s to %s" % (field, value),
).save_and_notify(
prevcommitter=prevcommitter,
prevreviewers=prevreviewers,