From 886c597b38bda9806fd20941d1b22a6034d8db95 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Thu, 2 Apr 2015 16:16:22 +0100 Subject: [PATCH] Removed RequestContext from userbar --- wagtail/wagtailadmin/userbar.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/wagtail/wagtailadmin/userbar.py b/wagtail/wagtailadmin/userbar.py index e1ca0d6a5..1629b8079 100644 --- a/wagtail/wagtailadmin/userbar.py +++ b/wagtail/wagtailadmin/userbar.py @@ -1,11 +1,12 @@ -from django.template import RequestContext from django.template.loader import render_to_string + class BaseItem(object): template = 'wagtailadmin/userbar/item_base.html' def render(self, request): - return render_to_string(self.template, dict(self=self, request=request), context_instance=RequestContext(request)) + return render_to_string(self.template, dict(self=self, request=request), request=request) + class AddPageItem(BaseItem): template = 'wagtailadmin/userbar/item_page_add.html' @@ -30,6 +31,7 @@ class AddPageItem(BaseItem): return super(AddPageItem, self).render(request) + class EditPageItem(BaseItem): template = 'wagtailadmin/userbar/item_page_edit.html' @@ -52,8 +54,8 @@ class EditPageItem(BaseItem): return super(EditPageItem, self).render(request) -class ModeratePageItem(BaseItem): +class ModeratePageItem(BaseItem): def __init__(self, revision): self.revision = revision @@ -72,8 +74,10 @@ class ModeratePageItem(BaseItem): return super(ModeratePageItem, self).render(request) + class ApproveModerationEditPageItem(ModeratePageItem): template = 'wagtailadmin/userbar/item_page_approve.html' + class RejectModerationEditPageItem(ModeratePageItem): template = 'wagtailadmin/userbar/item_page_reject.html'