Download as
Browse Code »

Commit efee32159602d2181af1dc2cd1abf1a1482f829c

Authored by filipecmedeiros
1 parent e175a38f
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Ordering users by name

Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/templates/home.html
  Diff comments   View file @efee321
... ... @@ -98,7 +98,7 @@
98 98 {% if user|has_role:'system_admin' %}
99 99  
100 100 <li>
101   - <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Manage Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
  101 + <a href="#menu_users" class="accordion" data-toggle="collapse">{% trans 'Users' %}<span class="pull-right glyphicon glyphicon-chevron-down"></span></a>
102 102 <div id="menu_users" class="collapse">
103 103 <ul class="nav nav-pill nav-stacked accordion_list">
104 104 <li> <a href="{% url 'users:manage' %}">{% trans 'Manage Users' %}</a></li>
... ...
users/views.py
  Diff comments   View file @efee321
... ... @@ -39,7 +39,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
39 39 search = self.request.GET.get('search', None)
40 40  
41 41 if search is None:
42   - users = User.objects.exclude(username = self.request.user.username)
  42 + users = User.objects.all().order_by('name').exclude( username = self.request.user.username)
43 43 else:
44 44 users = User.objects.filter(Q(username = search) | Q(name = search) | Q(name__icontains = search) | Q(username__icontains = search)).exclude( username = self.request.user.username)
45 45  
... ...