diff --git a/extensions/stats/views.py b/extensions/stats/views.py index 7a1308214..c656a73d6 100644 --- a/extensions/stats/views.py +++ b/extensions/stats/views.py @@ -4,8 +4,7 @@ from django.http import HttpResponse from django.core.urlresolvers import reverse from django.utils.translation import ugettext as _ from django.utils import simplejson -from django.template.loader import render_to_string -from modoboa.lib import _render, getctx +from modoboa.lib import _render, _render_to_string, getctx from modoboa.admin.views import good_domain from modoboa.admin.models import Domain, Mailbox from django.contrib.auth.decorators \ @@ -79,7 +78,7 @@ def getgraph(request, dom_id): tplvars["start"] = start tplvars["end"] = end if ctx is None: - content = render_to_string("stats/graphs.html", tplvars) + content = _render_to_string(request, "stats/graphs.html", tplvars) ctx = getctx("ok", content=content) return HttpResponse(simplejson.dumps(ctx), mimetype="application/json") diff --git a/lib/__init__.py b/lib/__init__.py index b851d81af..b69a2a59d 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -20,6 +20,10 @@ def _render(request, tpl, user_context): return render_to_response(tpl, user_context, context_instance=RequestContext(request)) +def _render_to_string(request, tpl, user_context): + return render_to_string(tpl, user_context, + context_instance=RequestContext(request)) + def _render_error(request, errortpl="error", user_context={}): return render_to_response("common/%s.html" % errortpl, user_context, context_instance=RequestContext(request)) diff --git a/userprefs/views.py b/userprefs/views.py index 3131dc7e4..6fc6e3d69 100644 --- a/userprefs/views.py +++ b/userprefs/views.py @@ -42,7 +42,7 @@ def changepassword(request): return HttpResponse(simplejson.dumps(ctx), mimetype="application/json") form = ChangePasswordForm(target) - return render_to_response('userprefs/chpassword.html', { + return _render(request, 'userprefs/chpassword.html', { "form" : form }) @@ -79,7 +79,7 @@ def savepreferences(request): @login_required def confirm(request): - return render_to_response('userprefs/confirm.html', { + return _render(request, 'userprefs/confirm.html', { "msg" : request.GET["question"] })