Merge lp:~mhall119/summit/order-users-by-username into lp:summit

[Michael Hall]

A quick and dirty monkey patching to give Users a sane order, added users real name in addition to their launchpad id, on meeting page also added real name in addition to launchpad id for participants.

A quick and dirty monkey patching to give Users a sane order, especially when used as a ForeignKey in the admin

[lp:~mhall119/summit/order-users-by-username]

277. By Michael Hall on 2012-01-27

Add easier way of adding/removing managers and schedulers from a summit

278. By Michael Hall on 2012-01-27

Include first and last name in user display where available

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/admin/summitadmin.py'
--- summit/schedule/admin/summitadmin.py	2012-01-23 01:18:55 +0000
+++ summit/schedule/admin/summitadmin.py	2012-01-27 02:07:25 +0000
@@ -75,6 +75,7 @@
     search_fields = ('name', 'title', 'location')
 
     inlines = (TrackInline, TopicInline, SprintInline)
+    filter_horizontal = ('schedulers', 'managers')
 
 admin.site.register(Summit, SummitAdmin)
 

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2012-01-24 19:07:39 +0000
+++ summit/schedule/models/summitmodel.py	2012-01-27 02:07:25 +0000
@@ -40,6 +40,20 @@
     'SummitSprint',
 )
 
+#Monkey patch for better use in the admin
+User._meta.ordering = ['username']
+def unicode_user(user):
+    display = []
+    if user.first_name:
+        display.append(user.first_name)
+    if user.last_name:
+        display.append(user.last_name)
+    if len(display) == 0:
+        return user.username
+    else:
+        return user.username + ' (' +' '.join(display) + ')'
+User.__unicode__ = unicode_user
+
 class SummitManager(models.Manager):
     
     def next(self):

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-01-24 05:06:04 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-01-27 02:07:25 +0000
@@ -125,7 +125,7 @@
             <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
             {% else %}
             <img class="icon" src="/media/img/attending.png">
-            {% endif %}{{ participant.attendee.user.username }}</div>
+            {% endif %}{{ participant.attendee.user }}</div>
     {% endfor %}</div>
     {% endif %}
     {% if agenda.meeting.tracks.count > 0 %}