Commit c10ee829 by Bridger Maxwell

Corrected parameters on render_to_response. Also fixed login url resolution when…

Corrected parameters on render_to_response. Also fixed login url resolution when ACCOUNT_HANDLING=False.
parent 9f1b3a98
# -*- coding: utf-8 -*-
from django.conf import settings as django_settings
from django.core.urlresolvers import reverse_lazy
# Should urls be case sensitive?
URL_CASE_SENSITIVE = getattr(django_settings, 'WIKI_URL_CASE_SENSITIVE', False)
......@@ -20,6 +21,11 @@ LOG_IPS_USERS = getattr(django_settings, 'WIKI_LOG_IPS_USERS', False)
ACCOUNT_HANDLING = getattr(django_settings, 'WIKI_ACCOUNT_HANDLING', True)
if ACCOUNT_HANDLING:
LOGIN_URL = reverse_lazy("wiki:login")
else:
LOGIN_URL = getattr(django_settings, "LOGIN_URL", "/")
####################
# PLANNED SETTINGS #
####################
......
......@@ -315,7 +315,7 @@ def preview(request, article, urlpath=None, template_file="wiki/preview_inline.h
'title': title,
'revision': revision,
'content': content})
return render_to_response(template_file, c)
return render_to_response(template_file, context_instance=c)
@json_view
def diff(request, revision_id, other_revision_id=None):
......@@ -376,7 +376,7 @@ def merge(request, article, revision_id, urlpath=None, template_file="wiki/previ
'merge2': article.current_revision,
'merge': True,
'content': content})
return render_to_response(template_file, c)
return render_to_response(template_file, context_instance=c)
def root_create(request):
try:
......@@ -388,7 +388,7 @@ def root_create(request):
except NoRootURL:
pass
if not request.user.has_perm('wiki.add_article'):
return redirect(reverse("wiki:login") + "?next=" + reverse("wiki:root_create"))
return redirect(settings.LOGIN_URL + "?next=" + reverse("wiki:root_create"))
if request.method == 'POST':
create_form = forms.CreateRoot(request.POST)
if create_form.is_valid():
......@@ -400,5 +400,5 @@ def root_create(request):
c = RequestContext(request, {'create_form': create_form,
'editor': editors.editor,})
return render_to_response("wiki/article/create_root.html", c)
return render_to_response("wiki/article/create_root.html", context_instance=c)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment