Merge lp:~mhall119/summit/search-private into lp:summit

[Michael Hall]

Show private meetings in search results only if the attendee is participating in that meeting

Show private meetings in search results only if the attendee is participating in that meeting

[lp:~mhall119/summit/search-private]

474. By Chris Johnston on 2012-10-31

[r=] Fixes typo for mouseover stuff

475. By Chris Johnston on 2012-12-18

[r=daker] Changes the way Summit parses version info

476. By José Antonio Rey on 2013-01-18

[r=daker] Adding blueprint link to daily, participant, room, and track views.

477. By José Antonio Rey on 2013-01-19

[r=mhall119] Exposed LP authorization cookie via settings

478. By Adnane Belmadiaf on 2013-01-19

[r=chrisjohnston] * Added friendly colors for the track block
* Css fixes
* Removed the empty context_processors file

479. By Chris Johnston on 2013-01-21

[r=daker] Adds field to sponsorship request to require a real name from the user.

480. By Adnane Belmadiaf on 2013-02-19

[r=mhall119] Transition to login.ubuntu.com

481. By Chris Johnston on 2013-02-20

[r=mhall119] Adds URL/virt fields, cleans up some tests, pep8 fixes

482. By Chris Johnston on 2013-02-23

[r=mhall119] A bunch of pep8 fixes and a virt display

483. By Chris Johnston on 2013-02-23

[r=mhall119] Moves the tests from one long file to a tests/ to start breaking them up logically

484. By Chris Johnston on 2013-02-26

[r=mhall119] Adds 22 tests for the new virtual meeting functionality.

485. By Chris Johnston on 2013-02-26

[r=mhall119] Updates copyrights

486. By Michael Hall on 2013-02-26

[r=chrisjohnston] Adds a placeholder image where the video will be when a broadcast url hasn't been set

487. By Chris Johnston on 2013-02-27

[r=mhall119] Fixes Google Analytics by adding it as a templatetag

488. By Michael Hall on 2013-02-27

[r=daker] Don't expose hangout_url over the API

489. By Michael Hall on 2013-02-27

Update from trunk

Unmerged revisions

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-10-27 14:59:34 +0000
+++ summit/schedule/tests.py	2012-10-28 15:07:21 +0000
@@ -2004,6 +2004,9 @@
             end_utc=now+one_hour)
         self.room = factory.make_one(Room)
   
+    def tearDown(self):
+        self.client.logout()
+            
     def test_searchform_exists_on_summit_view(self):
         ''' Search form should appear on the summit view page '''
         response = self.client.get(reverse('summit.schedule.views.summit', args=[self.summit.name]))
@@ -2066,3 +2069,38 @@
         self.assertContains(response, self.form_html, 1)
         self.assertContains(response, '<a href="%s">Test Title</a>' % meeting.get_meeting_page_url(), 1)
         
+    def test_private_meeting_not_shown(self):
+        ''' Private meetings should not be in the results if the attendee is not attending it'''
+        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.set_password('password')
+        user.save()
+        attendee = factory.make_one(Attendee, summit=self.summit, user=user, start_utc=now, end_utc=now+week)
+        participant = factory.make_one(Participant, meeting=meeting, attendee=attendee, participation='ATTENDING', from_launchpad=False)
+
+        # Attempt to match 'name' against 'test-name' in Meeting.name
+        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(), 0)
+    
+    def test_private_meeting_with_attendee_shown(self):
+        ''' Private meetings should be in the results if the attendee is attending it'''
+        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.set_password('password')
+        user.save()
+        attendee = factory.make_one(Attendee, summit=self.summit, user=user, start_utc=now, end_utc=now+week)
+        participant = factory.make_one(Participant, meeting=meeting, attendee=attendee, participation='ATTENDING', from_launchpad=False)
+        
+        logged_in = self.client.login(username='testuser', password='password')
+        self.assertTrue(logged_in)
+
+        # Attempt to match 'name' against 'test-name' in Meeting.name
+        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	2012-10-26 10:23:28 +0000
+++ summit/schedule/views.py	2012-10-28 15:07:21 +0000
@@ -81,13 +81,16 @@
     return render_to_response("schedule/summit.html", context,
                               context_instance=RequestContext(request))
 
-@summit_only_required
-def search(request, summit):
+@summit_required
+def search(request, summit, attendee):
     query = request.GET.get('q', None)
+    meetings = []
     if query:
-        meetings = summit.meeting_set.filter(Q(name__icontains=query) | Q(title__icontains=query))
-    else:
-        meetings = []
+        matches = summit.meeting_set.filter(Q(name__icontains=query) | Q(title__icontains=query))
+        for m in matches:
+            if not m.private or m.can_view_pm(attendee):
+                meetings.append(m)
+            
     
     context = {
         'summit': summit,