From efee32159602d2181af1dc2cd1abf1a1482f829c Mon Sep 17 00:00:00 2001
From: filipecmedeiros <fcma@cin.ufpe.br>
Date: Sat, 19 Nov 2016 11:51:40 -0300
Subject: [PATCH] Ordering users by name

---
 app/templates/home.html | 2 +-
 users/views.py          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/home.html b/app/templates/home.html
index 3f7be7e..2d195a5 100644
--- a/app/templates/home.html
+++ b/app/templates/home.html
@@ -98,7 +98,7 @@
                 {% if user|has_role:'system_admin' %}
                     
                     <li>
-                      <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Manage Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
+                      <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
                       <div id="menu_users" class="collapse">
                         <ul class="nav nav-pill nav-stacked accordion_list">
                           <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
diff --git a/users/views.py b/users/views.py
index 9cb3def..ea63b68 100644
--- a/users/views.py
+++ b/users/views.py
@@ -39,7 +39,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
 		search = self.request.GET.get('search', None)
 
 		if search is None:
-			users = User.objects.exclude(username = self.request.user.username)
+			users = User.objects.all().order_by('name').exclude( username = self.request.user.username)
 		else:
 			users = User.objects.filter(Q(username = search) | Q(name = search) | Q(name__icontains = search) | Q(username__icontains = search)).exclude( username = self.request.user.username)
 
--
libgit2 0.21.2