From ae4786825effa23eb1c807b6d0c8cf4c977e68cb Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 3 Jun 2015 08:34:12 +0200 Subject: [PATCH] [Backport] Fixing the ordering for the contacts endpoint in the users API --- taiga/users/api.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/taiga/users/api.py b/taiga/users/api.py index f8ed27ff..33ec137c 100644 --- a/taiga/users/api.py +++ b/taiga/users/api.py @@ -17,7 +17,7 @@ import uuid from django.apps import apps -from django.db.models import Q +from django.db.models import Q, F from django.utils.translation import ugettext as _ from django.core.validators import validate_email from django.core.exceptions import ValidationError @@ -97,7 +97,8 @@ class UsersViewSet(ModelCrudViewSet): self.check_permissions(request, 'contacts', user) self.object_list = user_filters.ContactsFilterBackend().filter_queryset( - user, request, self.get_queryset(), self) + user, request, self.get_queryset(), self).extra( + select={"complete_user_name":"concat(full_name, username)"}).order_by("complete_user_name") page = self.paginate_queryset(self.object_list) if page is not None: