From 9ae46a51835aab69cf9a6ca153b5b9ec6673f64b Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Sat, 21 Feb 2015 13:05:45 -0500 Subject: [PATCH] Use different types of labels for different patch statuses This highlights the different statuses better in a long list. --- pgcommitfest/commitfest/models.py | 8 ++++++++ pgcommitfest/commitfest/templates/commitfest.html | 2 +- pgcommitfest/commitfest/templatetags/commitfest.py | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pgcommitfest/commitfest/models.py b/pgcommitfest/commitfest/models.py index 0aa66dc..6035027 100644 --- a/pgcommitfest/commitfest/models.py +++ b/pgcommitfest/commitfest/models.py @@ -155,6 +155,14 @@ class PatchOnCommitFest(models.Model): (STATUS_RETURNED, 'Returned with Feedback'), (STATUS_REJECTED, 'Rejected'), ) + _STATUS_LABELS=( + (STATUS_REVIEW, 'default'), + (STATUS_AUTHOR, 'primary'), + (STATUS_COMMITTER, 'info'), + (STATUS_COMMITTED, 'success'), + (STATUS_RETURNED, 'warning'), + (STATUS_REJECTED, 'danger'), + ) OPEN_STATUSES=(STATUS_REVIEW, STATUS_AUTHOR, STATUS_COMMITTER) OPEN_STATUS_CHOICES=[x for x in _STATUS_CHOICES if x[0] in OPEN_STATUSES] diff --git a/pgcommitfest/commitfest/templates/commitfest.html b/pgcommitfest/commitfest/templates/commitfest.html index 056808f..04cf111 100644 --- a/pgcommitfest/commitfest/templates/commitfest.html +++ b/pgcommitfest/commitfest/templates/commitfest.html @@ -74,7 +74,7 @@ {%endif%} {{p}} - {{p.status|patchstatusstring}} + {{p.status|patchstatusstring}} {{p.author_names|default:''}} {{p.reviewer_names|default:''}} {{p.committer|default:''}}

diff --git a/pgcommitfest/commitfest/templatetags/commitfest.py b/pgcommitfest/commitfest/templatetags/commitfest.py index 07b5ea4..b8f68e4 100644 --- a/pgcommitfest/commitfest/templatetags/commitfest.py +++ b/pgcommitfest/commitfest/templatetags/commitfest.py @@ -11,6 +11,12 @@ def patchstatusstring(value): i = int(value) return [v for k,v in PatchOnCommitFest._STATUS_CHOICES if k==i][0] +@register.filter(name='patchstatuslabel') +@stringfilter +def patchstatuslabel(value): + i = int(value) + return [v for k,v in PatchOnCommitFest._STATUS_LABELS if k==i][0] + @register.filter(is_safe=True) def label_class(value, arg): return value.label_tag(attrs={'class': arg}) -- 2.39.5