This repository has been archived by the owner on Oct 29, 2019. It is now read-only.
Fixes issue with toolbar in some circumstances #351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
mkoistinen
force-pushed
the
fix_for_toolbar
branch
from
c6d5081 to
f3e7c0b
Compare
|
Rebased |
bplociennik
reviewed
Mar 18, 2019
| @@ -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)): | |||
There was a problem hiding this comment.
In a new version of Django cms we changed this and newsblog has this code to check edit_mode for old and new django-cms
https://github.com/divio/aldryn-newsblog/blob/master/aldryn_newsblog/compat.py
also:
https://github.com/divio/django-cms/blob/develop/cms/toolbar/toolbar.py#L81
https://github.com/divio/django-cms/blob/develop/cms/toolbar/toolbar.py#L493
but checking hasattr toolbar in a request is good in my opinion
| @@ -54,7 +54,8 @@ 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 | |||
| getattr(self.request.toolbar, "edit_mode")) | |||
There was a problem hiding this comment.
good point, we should have here:
self.edit_mode = (
hasattr(request, "toolbar") and toolbar_edit_mode_active(request))
|
Thanks for your contribution @mkoistinen. Could you please look into my comments and also rebase your code? |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.