Merge lp:~james-w/summit/usability into lp:summit

[James Westby]

Usability fixes for summit admin

Hi,

After helping someone do some things in the admin site earlier I felt compelled
to make these changes.

The change the attendee __unicode__ is likely the most important, as without
it each user gets one entry in the attendee select when creating a participant.
This means that it essentially picks a random summit for the attendee, and so
you can end up with a participant for completely different summit to the one
that the meeting is in. Without this change it is impossible to reliably
add a participant through the admin site.

The rest just improve the widgets, or add some help text to explain some
of the options, so people don't set them to the wrong thing.

Thanks,

James

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/admin/attendeeadmin.py'
--- summit/schedule/admin/attendeeadmin.py	2010-10-06 00:24:20 +0000
+++ summit/schedule/admin/attendeeadmin.py	2011-10-21 21:15:27 +0000
@@ -16,7 +16,7 @@
 
 from django.contrib import admin
 
-from summit.schedule.models import Attendee, AttendeeBusy, Participant
+from summit.schedule.models import Attendee, AttendeeBusy, Participant, Meeting
 
 __all__ = (
 )
@@ -35,6 +35,21 @@
                      'user__email')
     inlines = (AttendeeBusyInline, )
 
+
+class ParticipantAdmin(admin.ModelAdmin):
+    list_display = ('meeting', 'attendee', 'required')
+    list_display_links = ('attendee', )
+    search_fields = ('attendee__user__username', 'attendee__user__first_name', 'attendee__user__last_name',
+                     'attendee__user__email', 'meeting__name', 'meeting__title')
+
+    def formfield_for_foreignkey(self, db_field, request, **kwargs):
+        if db_field.name == "meeting":
+            kwargs["queryset"] = Meeting.objects.order_by('name')
+        if db_field.name == "attendee":
+            kwargs["queryset"] = Attendee.objects.order_by('user__username')
+        return super(ParticipantAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
+
+
 admin.site.register(Attendee, AttendeeAdmin)
 
-admin.site.register(Participant)
+admin.site.register(Participant, ParticipantAdmin)

=== modified file 'summit/schedule/admin/roomadmin.py'
--- summit/schedule/admin/roomadmin.py	2011-09-15 20:48:07 +0000
+++ summit/schedule/admin/roomadmin.py	2011-10-21 21:15:27 +0000
@@ -32,6 +32,7 @@
     list_display_links = ('name', 'title')
     list_filter = ('summit', 'type', 'tracks', 'size')
     search_fields = ('name', 'title')
+    filter_horizontal = ('tracks',)
 
     fieldsets = (
         (None, {

=== modified file 'summit/schedule/models/agendamodel.py'
--- summit/schedule/models/agendamodel.py	2010-03-05 10:33:36 +0000
+++ summit/schedule/models/agendamodel.py	2011-10-21 21:15:27 +0000
@@ -25,11 +25,18 @@
 )
 
 
+HELP_TEXT = {
+    "auto": ("Whether the meeting was autoscheduled. If this is not "
+        "set then the meeting was scheduled by hand."),
+}
+
+
 class Agenda(models.Model):
     slot = models.ForeignKey(Slot)
     room = models.ForeignKey(Room)
     meeting = models.ForeignKey(Meeting)
-    auto = models.BooleanField(default=False)
+    auto = models.BooleanField(default=False,
+            help_text=HELP_TEXT["auto"])
 
     class Meta:
         app_label = 'schedule'

=== modified file 'summit/schedule/models/attendeemodel.py'
--- summit/schedule/models/attendeemodel.py	2011-09-17 17:23:10 +0000
+++ summit/schedule/models/attendeemodel.py	2011-10-21 21:15:27 +0000
@@ -51,7 +51,7 @@
         ordering = ('summit', 'user')
 
     def __unicode__(self):
-        return self.user.username
+        return "%s (%s)" % (self.user.username, self.summit.name)
 
     def _get_start(self):
         return self.summit.localize(self.start_utc)

=== modified file 'summit/schedule/models/participantmodel.py'
--- summit/schedule/models/participantmodel.py	2011-10-18 19:17:05 +0000
+++ summit/schedule/models/participantmodel.py	2011-10-21 21:15:27 +0000
@@ -24,14 +24,35 @@
 )
 
 
+HELP_TEXT = {
+    "attendee": ("Be sure to choose the attendee from the correct "
+        "event. If the person is not listed for the event in question "
+        "then they are not known to be attending yet, and have to "
+        "sign up to attend."),
+    "required": ("The person is required to attend the session. "
+        "If this is set the scheduler will attempt to ensure that "
+        "the person is able to attend. If it is not checked then "
+        "the scheduler won't consider the person when deciding "
+        "where the meeting can go on the schedule."),
+    "from_launchpad": ("Set to indicate the participant comes from "
+        "a subscription to the Launchpad blueprint. Don't set this "
+        "if you are adding the participant, as they may end up "
+        "getting deleted if you do."),
+}
+
+
 class Participant(models.Model):
     meeting = models.ForeignKey(Meeting)
-    attendee = models.ForeignKey(Attendee)
-    required = models.BooleanField(default=False)
-    from_launchpad = models.BooleanField(default=False)
+    attendee = models.ForeignKey(Attendee,
+            help_text=HELP_TEXT["attendee"])
+    required = models.BooleanField(default=False,
+            help_text=HELP_TEXT["required"])
+    from_launchpad = models.BooleanField(default=False,
+            help_text=HELP_TEXT["from_launchpad"])
 
     class Meta:
         app_label = 'schedule'
+        ordering = ('meeting', 'attendee', 'required')
 
     def __unicode__(self):
         return self.attendee.user.username