Changeset 670
- Timestamp:
- 09/22/05 20:50:01 (3 years ago)
- Files:
-
- django/trunk/django/conf/global_settings.py (modified) (1 diff)
- django/trunk/django/utils/httpwrappers.py (modified) (1 diff)
- django/trunk/django/views/admin/main.py (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
django/trunk/django/conf/global_settings.py
r640 r670 32 32 # notifications and other various e-mails. 33 33 MANAGERS = ADMINS 34 35 # Default MIME type to use for all HttpResponse objects, if a MIME type 36 # isn't manually specified. This is directly used as the Content-Type header. 37 DEFAULT_MIME_TYPE = 'text/html; charset=utf-8' 34 38 35 39 # E-mail address that error messages come from. django/trunk/django/utils/httpwrappers.py
r668 r670 3 3 from urllib import urlencode 4 4 import datastructures 5 6 DEFAULT_MIME_TYPE = 'text/html' 5 from django.conf.settings import DEFAULT_MIME_TYPE 7 6 8 7 class HttpRequest(object): # needs to be new-style class because subclasses define "property"s django/trunk/django/views/admin/main.py
r654 r670 49 49 t = template_loader.get_template('index') 50 50 c = Context(request, {'title': 'Site administration'}) 51 return HttpResponse(t.render(c) , mimetype='text/html; charset=utf-8')51 return HttpResponse(t.render(c)) 52 52 53 53 def change_list(request, app_label, module_name): … … 492 492 'is_popup': is_popup, 493 493 }) 494 return HttpResponse(t.render(c) , mimetype='text/html; charset=utf-8')494 return HttpResponse(t.render(c)) 495 495 496 496 def _get_flattened_data(field, val): … … 789 789 if request.POST.has_key("_popup"): 790 790 return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \ 791 (pk_value, repr(new_object).replace('"', '\\"')) , mimetype='text/html; charset=utf-8')791 (pk_value, repr(new_object).replace('"', '\\"'))) 792 792 elif request.POST.has_key("_addanother"): 793 793 request.user.add_message("%s You may add another %s below." % (msg, opts.verbose_name)) … … 852 852 # return HttpResponse(raw_template, mimetype='text/plain') 853 853 t = template_loader.get_template_from_string(raw_template) 854 return HttpResponse(t.render(c) , mimetype='text/html; charset=utf-8')854 return HttpResponse(t.render(c)) 855 855 856 856 def change_stage(request, app_label, module_name, object_id): … … 977 977 # return HttpResponse(raw_template, mimetype='text/plain') 978 978 t = template_loader.get_template_from_string(raw_template) 979 return HttpResponse(t.render(c) , mimetype='text/html; charset=utf-8')979 return HttpResponse(t.render(c)) 980 980 981 981 def _nest_help(obj, depth, val): … … 1093 1093 "perms_lacking": perms_needed, 1094 1094 }) 1095 return HttpResponse(t.render(c) , mimetype='text/html; charset=utf-8')1095 return HttpResponse(t.render(c)) 1096 1096 1097 1097 def history(request, app_label, module_name, object_id): … … 1111 1111 'object': obj, 1112 1112 }) 1113 return HttpResponse(t.render(c) , mimetype='text/html; charset=utf-8')1113 return HttpResponse(t.render(c))
