vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fixed mime type of json to application/json

Browse source
This commit is contained in:
Anand Doshi 2014-03-13 14:48:34 +05:30
parent 38f9636e45
commit 8dcb89ccfc
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frappe/utils/response.py
View file

@ -39,19 +39,15 @@ def build_response(response_type=None):
def as_csv():
response = Response()
response.headers["Content-Type"] = \
"text/csv; charset: utf-8"
response.headers["Content-Disposition"] = \
"attachment; filename=%s.csv" % frappe.response['doctype'].replace(' ', '_')
response.headers["Content-Type"] = "text/csv; charset: utf-8"
response.headers["Content-Disposition"] = "attachment; filename=%s.csv" % frappe.response['doctype'].replace(' ', '_')
response.data = frappe.response['result']
return response
def as_raw():
response = Response()
response.headers["Content-Type"] = \
mimetypes.guess_type(frappe.response['filename'])[0] or "application/unknown"
response.headers["Content-Disposition"] = \
"filename=%s" % frappe.response['filename'].replace(' ', '_')
response.headers["Content-Type"] = mimetypes.guess_type(frappe.response['filename'])[0] or "application/unknown"
response.headers["Content-Disposition"] = "filename=%s" % frappe.response['filename'].replace(' ', '_')
response.data = frappe.response['filecontent']
return response
@ -59,7 +55,7 @@ def as_json():
make_logs()
cleanup_docs()
response = Response()
response.headers["Content-Type"] = "text/json; charset: utf-8"
response.headers["Content-Type"] = "application/json; charset: utf-8"
response = gzip(json.dumps(frappe.local.response, default=json_handler, separators=(',',':')),
response=response)
return response

6
frappe/website/render.py
View file

@ -93,15 +93,15 @@ def resolve_path(path):
def set_content_type(response, data, path):
if isinstance(data, dict):
response.headers[b"Content-Type"] = b"application/json; charset: utf-8"
response.headers["Content-Type"] = "application/json; charset: utf-8"
data = json.dumps(data)
return data
response.headers[b"Content-Type"] = b"text/html; charset: utf-8"
response.headers["Content-Type"] = "text/html; charset: utf-8"
if "." in path and not path.endswith(".html"):
content_type, encoding = mimetypes.guess_type(path)
response.headers[b"Content-Type"] = content_type.encode("utf-8")
response.headers["Content-Type"] = content_type.encode("utf-8")
return data