AO3-6004 show hidden bookmarks on a bookmarkable to admins #4758
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
walshyb
commented
Mar 1, 2024
walshyb
commented
Mar 1, 2024
walshyb
commented
Mar 1, 2024
| @@ -61,7 +61,9 @@ def search | |||
| def index | |||
| if @bookmarkable | |||
| access_denied unless is_admin? || @bookmarkable.visible? | |||
| @bookmarks = @bookmarkable.bookmarks.is_public.paginate(page: params[:page], per_page: ArchiveConfig.ITEMS_PER_PAGE) | |||
| @bookmarks = @bookmarkable.bookmarks.is_public | |||
| @bookmarks += @bookmarkable.bookmarks.where(hidden_by_admin: true) if is_admin? | |||
There was a problem hiding this comment.
I think this is a bit weird how I'm doing it, but I didn't see another way to include bookmarks that have been hidden by admin and the public bookmarks.
Also should I add check for policy_and_abuse role?
There was a problem hiding this comment.
Just a quick drive-by comment, not a thorough review:
- Let's not check the admin role, since I'm pretty sure we don't currently check it for, e.g., accessing hidden works directly. But maybe we should changes this two instances of
is_admin?tologged_in_as_admin?-- this seems to be the only file where we useis_admin?and that's weird, imo. - I'm guessing the problem with simply removing the
is_publicscope is you get private bookmarks as well as those hidden by admin? Would changing it to thenot_privatescope fix that? If not, I'd suggest defining a new scope in the bookmark model that will get public bookmarks, regardless of whether they're hidden by admin.
walshyb
commented
Mar 1, 2024
| @@ -82,6 +82,7 @@ Feature: Admin Actions for Works, Comments, Series, Bookmarks | |||
| When I follow "Hide Bookmark" | |||
| And all indexing jobs have been run | |||
| Then I should see "Item has been hidden." | |||
| And I should see "Make Bookmark Visible" | |||
There was a problem hiding this comment.
Should I add another check to follow this and confirm visible from regular user end?
There was a problem hiding this comment.
A regular user should not be able to see a hidden bookmark. But it would be nice to have a check that an admin can see the text of the hidden bookmark.
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.
Pull Request Checklist
as the first thing in your pull request title (e.g.
AO3-1234 Fix thing)until they are reviewed and merged before creating new pull requests.
Issue
https://otwarchive.atlassian.net/browse/AO3-6004
Purpose
Allows admins to show hidden bookmarks on a bookmarkable
Testing Instructions
Credit
Brandon W (he/him/they/them)