Include username in backend listings of speaker edit

diff --git a/postgresqleu/confreg/backendlookups.py b/postgresqleu/confreg/backendlookups.py
index 9f10d988299a149676155ff55124a680cf60aa8c..8762b5ef442883b6774774e57e016c543dbdbff7 100644 (file)
--- a/postgresqleu/confreg/backendlookups.py
+++ b/postgresqleu/confreg/backendlookups.py
@@ -79,11 +79,11 @@ class SpeakerLookup(LookupBase):
 
        @property
        def label_from_instance(self):
-               return lambda x: unicode(x)
+               return lambda x: u"%s (%s)" % (x.fullname, x.user.username)
 
        @classmethod
        def get_values(self, query):
-               return [{'id': s.id, 'value': unicode(s)}
+               return [{'id': s.id, 'value': u"%s (%s)" % (s.fullname, s.user.username)}
                                for s in Speaker.objects.filter(
                                                Q(fullname__icontains=query) | Q(twittername__icontains=query) | Q(user__username__icontains=query)
                                )[:30]]