DEV: Remove now-redundant is_staff? guardian check #33919
Merged
Conversation
This file contains hidden or 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
Drenmi
commented
Jul 29, 2025
| @@ -225,7 +225,7 @@ def can_delete_post?(post) | |||
| # Can't delete the first post | |||
| return false if post.is_first_post? | |||
|
|
|||
| return true if is_staff? || is_category_group_moderator?(post.topic&.category) | |||
There was a problem hiding this comment.
The group access check that now covers this is two lines down. 👇
f8349c0 to
4c2eb4f
Compare
Drenmi
commented
Jul 29, 2025
| @@ -145,22 +145,23 @@ def is_in_edit_topic_groups? | |||
| end | |||
|
|
|||
| def can_recover_topic?(topic) | |||
| if is_staff? || (topic&.category && is_category_group_moderator?(topic.category)) || | |||
| return false if topic.blank? | |||
There was a problem hiding this comment.
Hoisted this guard up here because it was checked in all three expressions below.
4c2eb4f to
ed1c134
Compare
tgxworld
approved these changes
Jul 29, 2025
martin-brennan
approved these changes
Jul 29, 2025
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.
What is this change?
Instead of doing both an
is_staff?and a group access check, just addadminsandmoderatorsas mandatory values to the group access setting.