Merge pull request #494 from pythonindia/revert-492-master

Revert "upgrade django to 1.8 #201"

Author: kracekumar

.travis.yml

@@ -2,7 +2,7 @@ language: python
 sudo: false
 python:
 - '2.7'
-- '3.5'
+- '3.4'
 addons:
   postgresql: "9.3"
 
@@ -11,8 +11,7 @@ cache:
   - $HOME/.pip-cache/
 
 install:
-  - pip install pip==8.1.2
-  - pip install -r requirements-dev.txt --allow-all-external
+  - pip install -r requirements-dev.txt --allow-all-external --download-cache $HOME/.pip-cache
   - pip install coveralls
 
 env:

junction/feedback/service.py

@@ -56,7 +56,7 @@ def get_choice_feedback_questions(conference_id):
     schedule item type.
     """
     qs = ChoiceFeedbackQuestion.objects.filter(
-        conference_id=conference_id).prefetch_related('allowed_values')
+        conference_id=conference_id).select_related('allowed_values')
     return _get_question_oragnized_by_type(qs)
 
 

requirements.txt

@@ -1,4 +1,4 @@
-Django==1.8.14
+Django==1.7.9
 celery==3.1.18
 djangorestframework==3.1.3
 django-filter==0.10.0