From 39a3f50a96890163eb50eeac9d012667d67c8f4a Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Thu, 24 Oct 2013 11:40:35 +0000 Subject: [PATCH] Add default charset for Django settings; change from default pdf output to html svn: r23380 --- gramps/webapp/grampsdb/views.py | 14 ++++++++++++-- gramps/webapp/settings.py | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/gramps/webapp/grampsdb/views.py b/gramps/webapp/grampsdb/views.py index 504234159..c77b3f169 100644 --- a/gramps/webapp/grampsdb/views.py +++ b/gramps/webapp/grampsdb/views.py @@ -206,7 +206,7 @@ def process_report_run(request, handle): if request.user.is_authenticated(): profile = request.user.get_profile() report = Report.objects.get(handle=handle) - args = {"off": "pdf", "iff": "ged"} # basic defaults + args = {"off": "html"} # basic defaults # override from given defaults in table: if report.options: for pair in str(report.options).split("\\n"): @@ -268,7 +268,17 @@ def process_report_run(request, handle): make_message(request, "Failed: '%s' is not found" % filename) return redirect("/report/") time.sleep(1) - return send_file(request, filename, mimetype) + # FIXME: the following should go into a queue for later presentation + # like a jobs-result queue + if filename.endswith(".html"): + # just give it, perhaps in a new tab + from django.http import HttpResponse + response = HttpResponse(mimetype="text/html") + content = "".join(open(filename).readlines()) + response._set_content(content) + return response + else: + return send_file(request, filename, mimetype) # If failure, just fail for now: context = RequestContext(request) context["message"] = "You need to be logged in to run reports." diff --git a/gramps/webapp/settings.py b/gramps/webapp/settings.py index cea5190ab..1bc052b6e 100644 --- a/gramps/webapp/settings.py +++ b/gramps/webapp/settings.py @@ -156,4 +156,5 @@ CACHES = { 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', } } +DEFAULT_CHARSET = "utf-8" ## End Changes for Django 1.5