T278420 #656
Merged
T278420 #656
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
sahilgrewal8072
force-pushed
the
T278420
branch
from
d676167
to
6ef4a67
Compare
suecarmol
requested changes
Apr 29, 2021
| @@ -68,7 +68,7 @@ <h2 style="padding-bottom:20px;">{% trans "Library Bundle" %} | |||
| </li> | |||
| {% endfor %} | |||
| </ul> | |||
| {% if user.is_authenticated and not user.editor.wp_not_blocked %} | |||
| {% if user.is_authenticated and not user.editor.ignore_wp_blocks and not user.editor.wp_not_blocked %} | |||
There was a problem hiding this comment.
As far as I understand, the ignore_wp_blocks flag should be on to ignore the blocks, so this condition has to be:
Suggested change
| {% if user.is_authenticated and not user.editor.ignore_wp_blocks and not user.editor.wp_not_blocked %} | |
| {% if user.is_authenticated and user.editor.ignore_wp_blocks and not user.editor.wp_not_blocked %} |
@Samwalton9 is this correct?
There was a problem hiding this comment.
This line is a little confusing because the block field is not_blocked so we're looking at not not_blocked (blocked) to see if we should show this message. It decides whether we show the 'you are blocked message' and we only want to do that if we haven't ignored their WP blocks.
suecarmol
approved these changes
Apr 29, 2021
There was a problem hiding this comment.
Based on @Samwalton9's comment, this is correct. Moving to merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changes have been made to hide red block message when the user is whitelisted
File TWLight/templates/home.html have been modified successfully for the above update
Bug:T278420