Merge lp:~mhall119/loco-team-portal/fix-globalevent-count into lp:loco-team-portal

[Michael Hall]

Chris added some query optimizations a while back for the past events page, but that shares a template include with the current events page, which didn't have the same optimization applied to it's view. This adds the same feature to the event_list view.

Chris added some query optimizations a while back for the past events page, but that shares a template include with the current events page, which didn't have the same optimization applied to it's view. This adds the same feature to the event_list view.

[Adnane Belmadiaf (daker)]

Looks good.

review: Approve

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-02-09 02:06:11 +0000
+++ loco_directory/events/views.py	2012-02-13 22:56:25 +0000
@@ -30,7 +30,7 @@
     a list with all events (teamevents and globalevents)
     """
     team_event_list = TeamEvent.objects.next_events()
-    global_event_list = GlobalEvent.objects.next_events()
+    global_event_list = GlobalEvent.objects.next_events().annotate(num_teamevents=Count('teamevent'))
     is_on_lc = launchpad.is_user_on_loco_council(request.user)
     context = {
         'team_event_list': team_event_list,