From 9a2308122991dbcb67c3ef89b9acdd3f77e95944 Mon Sep 17 00:00:00 2001 From: Martin Koistinen Date: Mon, 25 Jan 2016 09:00:33 -0500 Subject: [PATCH 1/2] Fixes issue with toolbar in some circumstances --- aldryn_newsblog/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aldryn_newsblog/views.py b/aldryn_newsblog/views.py index 6e2a7d8b..d54a3b78 100644 --- a/aldryn_newsblog/views.py +++ b/aldryn_newsblog/views.py @@ -54,7 +54,7 @@ class EditModeMixin(object): def dispatch(self, request, *args, **kwargs): self.edit_mode = ( - self.request.toolbar and self.request.toolbar.edit_mode) + hasattr(self.request, "toolbar") and self.request.toolbar.edit_mode) return super(EditModeMixin, self).dispatch(request, *args, **kwargs) From f3e7c0b1f7be7906ba7c26ab3d6e72be58e17498 Mon Sep 17 00:00:00 2001 From: Martin Koistinen Date: Mon, 25 Jan 2016 09:09:58 -0500 Subject: [PATCH 2/2] Don't assume toolbar is present --- aldryn_newsblog/menu.py | 3 ++- aldryn_newsblog/views.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aldryn_newsblog/menu.py b/aldryn_newsblog/menu.py index c0cad181..db66de8b 100644 --- a/aldryn_newsblog/menu.py +++ b/aldryn_newsblog/menu.py @@ -22,7 +22,8 @@ class NewsBlogMenu(CMSAttachMenu): def get_queryset(self, request): """Returns base queryset with support for preview-mode.""" queryset = Article.objects - if not (request.toolbar and request.toolbar.edit_mode): + if not (hasattr(request, "toolbar") and + getattr(request.toolbar, "edit_mode", False)): queryset = queryset.published() return queryset diff --git a/aldryn_newsblog/views.py b/aldryn_newsblog/views.py index d54a3b78..f977fc39 100644 --- a/aldryn_newsblog/views.py +++ b/aldryn_newsblog/views.py @@ -54,7 +54,8 @@ class EditModeMixin(object): def dispatch(self, request, *args, **kwargs): self.edit_mode = ( - hasattr(self.request, "toolbar") and self.request.toolbar.edit_mode) + hasattr(self.request, "toolbar") and + getattr(self.request.toolbar, "edit_mode")) return super(EditModeMixin, self).dispatch(request, *args, **kwargs)