Merge branch 'develop' of github.com:django-json-api/django-rest-framework-json-api into feature/JsonAPISpec

Author: jsenecal

README.rst

@@ -2,7 +2,7 @@
 JSON API and Django Rest Framework
 ====================================
 
-.. image:: https://travis-ci.org/django-json-api/django-rest-framework-json-api.svg?branch=master
+.. image:: https://travis-ci.org/django-json-api/django-rest-framework-json-api.svg?branch=develop
    :target: https://travis-ci.org/django-json-api/django-rest-framework-json-api
 
 .. image:: https://readthedocs.org/projects/django-rest-framework-json-api/badge/?version=latest

rest_framework_json_api/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __title__ = 'djangorestframework-jsonapi'
-__version__ = '2.0.0-alpha.1'
+__version__ = '2.0.0-alpha.2'
 __author__ = ''
 __license__ = 'MIT'
 __copyright__ = ''

rest_framework_json_api/mixins.py

@@ -10,7 +10,10 @@ def get_queryset(self):
         """
         Override :meth:``get_queryset``
         """
-        ids = dict(self.request.QUERY_PARAMS).get('ids[]')
+        if hasattr(self.request, 'query_params'):
+            ids = dict(self.request.query_params).get('ids[]')
+        else:
+            ids = dict(self.request.QUERY_PARAMS).get('ids[]')
         if ids:
             self.queryset = self.queryset.filter(id__in=ids)
         return self.queryset