From 269b093b28d2157d16d88c80e7db4e8cb29d0016 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Fri, 14 Sep 2012 03:02:00 +0200
Subject: [PATCH] Enhence use of config var and Meta Class for default sorting
 of users

---
 openslides/participant/models.py | 8 ++++++--
 openslides/participant/views.py  | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index 662dcf9e3..1eef00093 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -100,6 +100,7 @@ class User(DjangoUser, PersonMixin):
             ('can_manage_participant',
                 ugettext_noop("Can manage participant")),
         )
+        ordering = ('last_name',)
 
 
 class Group(DjangoGroup, PersonMixin):
@@ -126,6 +127,9 @@ class Group(DjangoGroup, PersonMixin):
     def __unicode__(self):
         return unicode(self.name)
 
+    class Meta:
+        ordering = ('name',)
+
 
 class UsersAndGroupsToPersons(object):
     """
@@ -138,8 +142,8 @@ class UsersAndGroupsToPersons(object):
         if config['participant_sort_users_by_first_name']:
             self.users = User.objects.all().order_by('first_name')
         else:
-            self.users = User.objects.all().order_by('last_name')
-        self.groups = Group.objects.filter(group_as_person=True).order_by('name')
+            self.users = User.objects.all()
+        self.groups = Group.objects.filter(group_as_person=True)
 
     def __iter__(self):
         if (not self.person_prefix_filter or
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 1cc4dbc72..63d70f77b 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -53,7 +53,7 @@ from openslides.participant.models import User, Group
 
 class Overview(ListView):
     """
-    Show all participants.
+    Show all participants (users).
     """
     permission_required = 'participant.can_see_participant'
     template_name = 'participant/overview.html'
@@ -96,7 +96,8 @@ class Overview(ListView):
                 query = query.order_by(
                     '%s' % sortfilter['sort'][0])
         else:
-            query = query.order_by('last_name')
+            if config['participant_sort_users_by_first_name']:
+                query = query.order_by('first_name')
 
         if 'reverse' in sortfilter:
             query = query.reverse()