Merge branch 'master' into patch-1

Author: auvipy

AUTHORS

@@ -36,6 +36,7 @@ Jerome Leclanche
 Jim Graham
 Jonas Nygaard Pedersen
 Jonathan Steffan
+Jozef Knaperek
 Jun Zhou
 Kristian Rune Larsen
 Paul Dekkers

docs/tutorial/tutorial_01.rst

@@ -9,14 +9,14 @@ Start Your App
 --------------
 During this tutorial you will make an XHR POST from a Heroku deployed app to your localhost instance.
 Since the domain that will originate the request (the app on Heroku) is different from the destination domain (your local instance),
-you will need to install the `django-cors-middleware <https://github.com/zestedesavoir/django-cors-middleware>`_ app.
+you will need to install the `django-cors-headers <https://github.com/adamchainz/django-cors-headers>`_ app.
 These "cross-domain" requests are by default forbidden by web browsers unless you use `CORS <http://en.wikipedia.org/wiki/Cross-origin_resource_sharing>`_.
 
-Create a virtualenv and install `django-oauth-toolkit` and `django-cors-middleware`:
+Create a virtualenv and install `django-oauth-toolkit` and `django-cors-headers`:
 
 ::
 
-    pip install django-oauth-toolkit django-cors-middleware
+    pip install django-oauth-toolkit django-cors-headers
 
 Start a Django project, add `oauth2_provider` and `corsheaders` to the installed apps, and enable admin:
 

oauth2_provider/admin.py

@@ -26,6 +26,7 @@ class ApplicationAdmin(admin.ModelAdmin):
 
 class AccessTokenAdmin(admin.ModelAdmin):
     list_display = ("token", "user", "application", "expires")
+    list_select_related = ("application", "user")
     raw_id_fields = ("user", "source_refresh_token")