summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/options.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 8b0af2b78d..a09c958282 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -1135,9 +1135,9 @@ class ModelAdmin(BaseModelAdmin):
new_value = obj.serializable_value(attr)
popup_response_data = json.dumps({
'action': 'change',
- 'value': value,
+ 'value': six.text_type(value),
'obj': six.text_type(obj),
- 'new_value': new_value,
+ 'new_value': six.text_type(new_value),
})
return SimpleTemplateResponse('admin/popup_response.html', {
'popup_response_data': popup_response_data,