Merge pull request #462 from ox-it/django-1_8

Django 1.8
ox-it · May 13, 2016 · e276864 · e276864
2 parents 87b90c3 + 5404ac0
commit e276864
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.7.3
+Django==1.8.13
 pytz
 pyaml
 djangorestframework==3.0.3
@@ -13,4 +13,4 @@ git+https://github.com/ox-it/django-webauth.git@0.4#egg=django-webauth
 python-ldap==2.4.15
 django-reversion==1.8.5
 textile==2.2.1
-django-cors-headers==1.0.0
+django-cors-headers==1.0.0
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,9 +1,9 @@
-django-debug-toolbar==1.2.1
+django-debug-toolbar==1.4
 fabric==1.9.0
-Sphinx==1.3.1
+Sphinx==1.4.1
 sphinxcontrib-httpdomain==1.3.0
 nose==1.3.4
-django-nose==1.3
+django-nose==1.4.3
 coverage==3.7.1
 factory-boy==2.4.1
 robotframework==2.8.6

diff --git a/talks/events/models.py b/talks/events/models.py
@@ -251,7 +251,7 @@ class PublishedEventManager(models.Manager):
     """
 
     def get_queryset(self):
-        return super(PublishedEventManager, self).get_query_set().filter(embargo=False,
+        return super(PublishedEventManager, self).get_queryset().filter(embargo=False,
                                                                          status=EVENT_PUBLISHED)
 
 

diff --git a/talks/events/views.py b/talks/events/views.py
@@ -240,13 +240,12 @@ def show_event(request, event_slug):
     try:
         # TODO depending if user is admin or not,
         # we should use Event.published here...
+
         ev = Event.objects.select_related(
-            'speakers',
-            'hosts',
-            'organisers',
-            'location',
             'group',
-            'department_organiser').get(slug=event_slug)
+            ).prefetch_related(
+            'person_set',
+            ).get(slug=event_slug)
     except Event.DoesNotExist:
         raise Http404