Merge lp:~mhall119/summit/preserve-required into lp:summit

[Chris Johnston]

Keeps required participants required.

[Chris Johnston (cjohnston)]

Conflicts need to be fixed please.

review: Needs Fixing

[Chris Johnston (cjohnston)]

review: Approve

[Chris Johnston (cjohnston)]

review: Approve

[Tarmac WebDev (tarmac-webdev)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Chris Johnston (cjohnston)]

review: Approve

[Tarmac WebDev (tarmac-webdev)]

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/schedule/tests/tests.py
text conflict in summit/schedule/views.py

[lp:~mhall119/summit/preserve-required]

490. By Michael Hall on 2013-02-27

[r=daker] Adds a javascript refresh to the youtube placeholder image to continue checking for a video url

491. By Chris Johnston on 2013-02-27

[r=mhall119] Separate tests into different files

492. By Michael Hall on 2013-02-27

Once again, merge from trunk and fix conflicts

Unmerged revisions

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2013-02-26 20:00:45 +0000
+++ summit/schedule/models/meetingmodel.py	2013-02-27 14:57:18 +0000
@@ -497,10 +497,11 @@
                     )[0]
 
                 participant.from_launchpad = True
-                if required:
-                    participant.participation = 'INTERESTED'
-                else:
-                    participant.participation = 'ATTENDING'
+                if not participant.participation == 'REQUIRED':
+                    if required:
+                        participant.participation = 'INTERESTED'
+                    else:
+                        participant.participation = 'ATTENDING'
                 participant.save()
             except ObjectDoesNotExist:
                 pass

=== modified file 'summit/schedule/tests/tests.py'
--- summit/schedule/tests/tests.py	2013-02-27 03:18:38 +0000
+++ summit/schedule/tests/tests.py	2013-02-27 14:57:18 +0000
@@ -3385,7 +3385,7 @@
         now = datetime.datetime.now()
         week = datetime.timedelta(days=7)
         meeting = factory.make_one(Meeting, summit=self.summit, name='test-name', title='Test Title', requires_dial_in=False, private=True)
-        user = factory.make_one(User, username='testuser', first_name='Test', last_name='User', is_active=True)
+        user = factory.make_one(User, username='testuser', first_name='Test', last_name='User', is_active=True, is_superuser=False)
         user.set_password('password')
         user.save()
         attendee = factory.make_one(Attendee, summit=self.summit, user=user, start_utc=now, end_utc=now+week)
@@ -3414,4 +3414,3 @@
         response = self.client.get(reverse('summit.schedule.views.search', args=[self.summit.name]), {'q': 'test'})
         self.assertContains(response, self.form_html, 1)
         self.assertContains(response, '<a href="%s">Test Title</a>' % meeting.get_meeting_page_url(), 1)
-

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-02-27 03:18:38 +0000
+++ summit/schedule/views.py	2013-02-27 14:57:18 +0000
@@ -92,7 +92,7 @@
         for m in matches:
             if not m.private or m.can_view_pm(attendee):
                 meetings.append(m)
-            
+
     context = {
         'summit': summit,
         'query': query,