AO3-6067 Uncategorized fandoms in collections not showing #5514
+72
−6
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
The new fandom method actually would return any fandom, even possible copy of fandom already in fandom_ids
Contributor
Author
|
I'd like to add a test to make sure that non-canonical fandoms don't get double counted. How exactly do I set up a non-canonical fandom under a canonical fandom in cucumber? After this is done, I shall remove put this as ready for review |
| query.search_results.each do |work| | ||
| list |= work.fandom_ids if work.fandom_ids.present? | ||
| work.tag_groups["Fandom"].each do |fandom| | ||
| list.push(fandom.id) if Fandom.find_by(id: fandom.id).unwrangled? |
Member
There was a problem hiding this comment.
Suggested change
| list.push(fandom.id) if Fandom.find_by(id: fandom.id).unwrangled? | |
| list.push(fandom.id) if fandom.unwrangled? |
Will this work?
| def index | ||
| if @collection | ||
| @media = Media.canonical.by_name - [Media.find_by(name: ArchiveConfig.MEDIA_NO_TAG_NAME)] - [Media.find_by(name: ArchiveConfig.MEDIA_UNCATEGORIZED_NAME)] | ||
| @media = Media.canonical.by_name.where.not(name: [ArchiveConfig.MEDIA_UNCATEGORIZED_NAME, ArchiveConfig.MEDIA_NO_TAG_NAME]) + [Media.uncategorized] |
Member
There was a problem hiding this comment.
Suggested change
| @media = Media.canonical.by_name.where.not(name: [ArchiveConfig.MEDIA_UNCATEGORIZED_NAME, ArchiveConfig.MEDIA_NO_TAG_NAME]) + [Media.uncategorized] | |
| @media = Media.canonical.by_name.where.not(name: [ArchiveConfig.MEDIA_NO_TAG_NAME]) |
This should be enough too, what do you think?
Contributor
Author
There was a problem hiding this comment.
I think removing it then adding it back is necessary for the uncategorized fandoms to show last
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Issue
https://otwarchive.atlassian.net/browse/AO3-6067
Purpose
This makes uncategorized fandoms be listed on collection fandoms page. As a bonus, this also makes the unwrangled tags collection page show only the work in the collection. This modifies the method used to fetch the fandom (being a combination of how it used to work with the fandom_ids field, and how view works, by going through the fandom tags on the work).
Credit
Danaël / Rever ( they / he )
Danaël Villeneuve on jira