diff options
author | Magnus Hagander | 2013-08-24 14:29:46 +0000 |
---|---|---|
committer | Magnus Hagander | 2013-08-24 14:29:46 +0000 |
commit | 7f85eac26c7af18980f85c4fce44875eb603e670 (patch) | |
tree | f66f4aa539567085431f1250c2c2ed0125030405 | |
parent | 1624940a6304120cef2616a37f38dd502df82d53 (diff) |
Add ability to query for own patches
-rw-r--r-- | pgcommitfest/commitfest/forms.py | 2 | ||||
-rw-r--r-- | pgcommitfest/commitfest/views.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pgcommitfest/commitfest/forms.py b/pgcommitfest/commitfest/forms.py index 6d4c115..8c67d89 100644 --- a/pgcommitfest/commitfest/forms.py +++ b/pgcommitfest/commitfest/forms.py @@ -26,7 +26,7 @@ class CommitFestFilterForm(forms.Form): self.fields['status'] = forms.ChoiceField(choices=c, required=False) q = Q(patch_author__commitfests=cf) | Q(patch_reviewer__commitfests=cf) - userchoices = [(-1, '* All'), (-2, '* None'), ] + [(u.id, '%s %s (%s)' % (u.first_name, u.last_name, u.username)) for u in User.objects.filter(q).distinct()] + userchoices = [(-1, '* All'), (-2, '* None'), (-3, '* Yourself') ] + [(u.id, '%s %s (%s)' % (u.first_name, u.last_name, u.username)) for u in User.objects.filter(q).distinct()] self.fields['author'] = forms.ChoiceField(choices=userchoices, required=False) self.fields['reviewer'] = forms.ChoiceField(choices=userchoices, required=False) diff --git a/pgcommitfest/commitfest/views.py b/pgcommitfest/commitfest/views.py index 2066d64..fb34125 100644 --- a/pgcommitfest/commitfest/views.py +++ b/pgcommitfest/commitfest/views.py @@ -39,11 +39,15 @@ def commitfest(request, cfid): if request.GET.has_key('author') and request.GET['author'] != "-1": if request.GET['author'] == '-2': q = q & Q(authors=None) + elif request.GET['author'] == '-3': + q = q & Q(authors=request.user) else: q = q & Q(authors__id=int(request.GET['author'])) if request.GET.has_key('reviewer') and request.GET['reviewer'] != "-1": if request.GET['reviewer'] == '-2': q = q & Q(reviewers=None) + elif request.GET['reviewer'] == '-3': + q = q & Q(reviewers=request.user) else: q = q & Q(reviewers__id=int(request.GET['reviewer'])) |