Fix sorting of users (committers, authors and reviewers)

diff --git a/pgcommitfest/commitfest/forms.py b/pgcommitfest/commitfest/forms.py
index 930f5eff74b0f57e3e5143d5e7b0d958106e5370..2a832ae915ef64a5792b0da95c819cd75bc7f696 100644 (file)
--- a/pgcommitfest/commitfest/forms.py
+++ b/pgcommitfest/commitfest/forms.py
@@ -27,7 +27,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'), (-3, '* Yourself') ] + [(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().order_by('last_name', 'first_name')]
                self.fields['author'] = forms.ChoiceField(choices=userchoices, required=False)
                self.fields['reviewer'] = forms.ChoiceField(choices=userchoices, required=False)
 

diff --git a/pgcommitfest/commitfest/models.py b/pgcommitfest/commitfest/models.py
index 21fe733ebfd4818b490c9534bba59801bbc2807d..d60a1aac387c928f24397e79790469d68db1649a 100644 (file)
--- a/pgcommitfest/commitfest/models.py
+++ b/pgcommitfest/commitfest/models.py
@@ -19,6 +19,9 @@ class Committer(models.Model):
        def fullname(self):
                return "%s %s (%s)" % (self.user.first_name, self.user.last_name, self.user.username)
 
+       class Meta:
+               ordering = ('user__last_name', 'user__first_name')
+
 class CommitFest(models.Model):
        STATUS_FUTURE=1
        STATUS_OPEN=2