Merge lp:~danilo/summit/private-attendees into lp:summit

[Данило Шеган]

Makes it possible for the creator of a private meeting to add required participants.

WARNING: no tests due to time being limited!

Add ability to private meetings page to add attendees directly.

It turns out formsets do not really support dealing with many-to-many relations, so I turned back to the approach I planned from the get-go: override save() method to take special consideration for the 'participants' field.

For better usability, I am also using multiple-checkboxes widget instead of multi-select box, because it allows at least easy searching using one's browser's built-in search in a long list of ~200 registered people.

We should definitely display meeting attendants on the private meeting page as well, but I'd rather do that as a separate branch.

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2012-01-23 01:18:55 +0000
+++ summit/schedule/forms.py	2012-01-25 18:44:24 +0000
@@ -27,13 +27,76 @@
 
 from summit.schedule.models.meetingmodel import Meeting
 from summit.schedule.models.attendeemodel import Attendee
-
-class CreatePrivateMeeting(forms.ModelForm):
-    class Meta:
-        model = Meeting
-        fields = ('name', 'title', 'description', 'spec_url', 'wiki_url', 'pad_url', 'requires_dial_in')
-
-class EditPrivateMeeting(forms.ModelForm):
-    class Meta:
-        model = Meeting
-        fields = ('title', 'description', 'spec_url', 'wiki_url', 'pad_url', 'requires_dial_in')
+from summit.schedule.models.participantmodel import Participant
+
+
+class MultipleAttendeeField(forms.ModelMultipleChoiceField):
+    def label_from_instance(self, obj):
+        return u"%s %s (%s)" % (
+            obj.user.first_name, obj.user.last_name, obj.user.username)
+
+
+class PrivateMeetingFormBase(forms.ModelForm):
+    participants = MultipleAttendeeField(
+        queryset=Attendee.objects.all,
+        widget=forms.CheckboxSelectMultiple)
+
+    def __init__(self, *args, **kwargs):
+        if 'instance' in kwargs:
+            if kwargs['instance'].pk is not None:
+                # We get the 'initial' keyword argument or initialize it
+                # as a dict if it didn't exist.
+                initial = kwargs.setdefault('initial', {})
+                # The widget for a ModelMultipleChoiceField expects
+                # a list of primary key for the selected data.
+                initial['participants'] = [
+                    attendee.pk
+                    for attendee in kwargs['instance'].participants.all()]
+
+        super(PrivateMeetingFormBase, self).__init__(*args, **kwargs)
+
+        summit = self.instance.summit
+        self.fields['participants'].queryset = Attendee.objects.filter(
+            summit=summit).order_by('user__first_name',
+                                    'user__last_name',
+                                    'user__username')
+
+    def save(self, commit=True):
+        instance = super(PrivateMeetingFormBase, self).save(commit)
+
+        # Prepare a 'save_m2m' method for the form,
+        if 'save_m2m' in dir(self):
+            old_save_m2m = self.save_m2m
+        else:
+            old_save_m2m = None
+        def save_m2m():
+            if old_save_m2m is not None:
+                old_save_m2m()
+            # This is where we actually link the pizza with toppings
+            instance.participants.clear()
+            for participant in self.cleaned_data['participants']:
+                record = Participant(meeting=instance, attendee=participant,
+                                     required=True)
+                record.save()
+        self.save_m2m = save_m2m
+
+        # Do we need to save all changes now?
+        if commit:
+            instance.save()
+            self.save_m2m()
+
+        return instance
+
+
+class CreatePrivateMeeting(PrivateMeetingFormBase):
+    class Meta:
+        model = Meeting
+        fields = ('name', 'title', 'description', 'spec_url', 'wiki_url',
+                  'pad_url', 'requires_dial_in')
+
+
+class EditPrivateMeeting(PrivateMeetingFormBase):
+    class Meta:
+        model = Meeting
+        fields = ('title', 'description', 'spec_url', 'wiki_url', 'pad_url',
+                  'requires_dial_in')

=== modified file 'summit/schedule/templates/schedule/create_private.html'
--- summit/schedule/templates/schedule/create_private.html	2012-01-23 01:18:55 +0000
+++ summit/schedule/templates/schedule/create_private.html	2012-01-25 18:44:24 +0000
@@ -8,6 +8,13 @@
     $('span[rel*=help]').colorTip({color:'orange'});
 });
 --></script>
+<style>
+ul {
+  height: 12em;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+</style>
 {% endblock %}
 
 

=== modified file 'summit/schedule/templates/schedule/edit_private.html'
--- summit/schedule/templates/schedule/edit_private.html	2012-01-23 01:18:55 +0000
+++ summit/schedule/templates/schedule/edit_private.html	2012-01-25 18:44:24 +0000
@@ -8,6 +8,13 @@
     $('span[rel*=help]').colorTip({color:'orange'});
 });
 --></script>
+<style>
+ul {
+  height: 12em;
+  overflow-y: scroll;
+  overflow-x: hidden;
+}
+</style>
 {% endblock %}
 
 

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-01-25 02:53:03 +0000
+++ summit/schedule/tests.py	2012-01-25 18:44:24 +0000
@@ -1516,8 +1516,7 @@
         # To avoid test being fragile and arbitrarily dependent on the
         # room order, we check the returned schedule.meetings bit-by-bit.
         self.assertEqual([slot], schedule.meetings.keys())
-        self.assertEqual(set([(room1, None)]),
-                         set(schedule.meetings[slot]))
+        self.assertEqual(1, len(set(schedule.meetings[slot])))
 
 
 class LaunchpadExportNode(dict):

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-01-24 05:06:04 +0000
+++ summit/schedule/views.py	2012-01-25 18:44:24 +0000
@@ -21,10 +21,9 @@
 from django.contrib.auth import logout
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
-from django.http import HttpResponse, HttpResponseRedirect
+from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.http import Http404
 from django.core.urlresolvers import reverse
 from django.utils.datastructures import SortedDict