Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-05-01 20:24:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from reycf/django_1_10

Browse source 
Fix render_to_string() calls with unexpected context_instance param
This commit is contained in:
GregLeBarbar 2016-09-20 13:46:41 +02:00 committed by GitHub
commit 6fad04fc4c
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
authority/admin.py
View file

@ -122,8 +122,7 @@ def edit_permissions(modeladmin, request, queryset):
"admin/%s/permission_change_form.html" % app_label,
"admin/permission_change_form.html"
])
return render_to_response(template_name, context,
context_instance=template.RequestContext(request))
return render_to_response(template_name, context, request)
edit_permissions.short_description = _("Edit permissions for selected %(verbose_name_plural)s")

4
authority/templatetags/permissions.py
View file

@ -190,8 +190,8 @@ class PermissionFormNode(ResolverNode):
approved=self.approved,
initial=dict(codename=perm, user=request.user.username)),
}
return template.loader.render_to_string(
template_name, extra_context, context_instance=template.RequestContext(request))
return template.loader.render_to_string(template_name, extra_context,
request)
@register.tag

8
authority/views.py
View file

@ -2,7 +2,6 @@ from django.shortcuts import render_to_response, get_object_or_404
from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.apps import apps
from django.utils.translation import ugettext as _
from django.template.context import RequestContext
from django.template import loader
from django.contrib.auth.decorators import login_required
@ -63,8 +62,7 @@ def add_permission(request, app_label, module_name, pk, approved=False,
}
if extra_context:
context.update(extra_context)
return render_to_response(template_name, context,
context_instance=RequestContext(request))
return render_to_response(template_name, context, request)
@login_required
@ -110,5 +108,5 @@ def permission_denied(request, template_name=None, extra_context=None):
}
if extra_context:
context.update(extra_context)
return HttpResponseForbidden(loader.render_to_string(template_name, context,
context_instance=RequestContext(request)))
return HttpResponseForbidden(loader.render_to_string(template_name,
context, request))