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

[Chris Johnston]

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]

488. By Michael Hall on 2013-02-27

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

[Chris Johnston (cjohnston)]

Conflicts need to be fixed please.

review: Needs Fixing

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

489. By Michael Hall on 2013-02-27

Update from trunk

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/schedule/tests/tests.py'
--- summit/schedule/tests/tests.py	2013-02-26 20:00:45 +0000
+++ summit/schedule/tests/tests.py	2013-02-27 03:21:20 +0000
@@ -3221,8 +3221,8 @@
         self.room = factory.make_one(Room)
 
     def tearDown(self):
-        pass
-
+        self.client.logout()
+            
     def test_searchform_exists_on_summit_view(self):
         ''' Search form should appear on the summit view page '''
         response = self.client.get(
@@ -3379,3 +3379,39 @@
             '<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	2013-02-26 20:00:45 +0000
+++ summit/schedule/views.py	2013-02-27 03:21:20 +0000
@@ -83,17 +83,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,
         'query': query,