Merge lp:~cjohnston/summit/1050944-1050943 into lp:summit

[Chris Johnston]

This fixes the missing Participant when trying to attend a meeting or adjust the users who are attending the meeting.

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-08-12 22:32:46 +0000
+++ summit/schedule/views.py	2012-09-14 15:04:26 +0000
@@ -24,26 +24,33 @@
 from django.core.urlresolvers import reverse
 from django.utils.datastructures import SortedDict
 
-from summit.schedule.decorators import (summit_required,
-                                        summit_only_required,
-                                        summit_attendee_required)
+from summit.schedule.decorators import (
+    summit_required,
+    summit_only_required,
+    summit_attendee_required
+)
 
-from summit.schedule.models import (Summit,
-                                    Slot,
-                                    Attendee,
-                                    Meeting,
-                                    Track,
-                                    Room)
+from summit.schedule.models import (
+    Summit,
+    Slot,
+    Attendee,
+    Meeting,
+    Track,
+    Room,
+    Participant
+)
 
 from summit.schedule.render import schedule_factory, Schedule
 
-from summit.schedule.forms import (CreateMeeting,
-                                   OrganizerEditMeeting,
-                                   ProposeMeeting,
-                                   EditMeeting,
-                                   MeetingReview,
-                                   AttendMeeting,
-                                   OrganizerChangeAttend)
+from summit.schedule.forms import (
+    CreateMeeting,
+    OrganizerEditMeeting,
+    ProposeMeeting,
+    EditMeeting,
+    MeetingReview,
+    AttendMeeting,
+    OrganizerChangeAttend
+)
 
 __all__ = (
     'summit',