summaryrefslogtreecommitdiff
path: root/docs/ref/contrib/admin
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-01-31 13:39:29 +0100
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-01-31 13:54:40 +0100
commit89cb771be7b53c40642872cdbedb15943bdf8e34 (patch)
tree43b9e7addfe0d5f2ad99a569507f4c19562e4aef /docs/ref/contrib/admin
parentb2039d39d537340c1617f23d68b3f40f070e01db (diff)
Fixed #19692 -- Completed deprecation of mimetype in favor of content_type.
Thanks Tim for the report and initial patch.
Diffstat (limited to 'docs/ref/contrib/admin')
-rw-r--r--docs/ref/contrib/admin/actions.txt4
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/ref/contrib/admin/actions.txt b/docs/ref/contrib/admin/actions.txt
index d7eef623d5..0a302ecd1d 100644
--- a/docs/ref/contrib/admin/actions.txt
+++ b/docs/ref/contrib/admin/actions.txt
@@ -223,7 +223,7 @@ objects as JSON::
from django.core import serializers
def export_as_json(modeladmin, request, queryset):
- response = HttpResponse(mimetype="text/javascript")
+ response = HttpResponse(content_type="application/json")
serializers.serialize("json", queryset, stream=response)
return response
@@ -356,5 +356,3 @@ Conditionally enabling or disabling actions
if 'delete_selected' in actions:
del actions['delete_selected']
return actions
-
-