[8.x] backport some commits #3517
Merged
+44
−12
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
Fixes two cases of Rails/Delegate, which are now caught thanks to an enhancement in rubocop-rails 2.30.0. See https://github.com/rubocop/rubocop-rails/releases/tag/v2.30.0
…vot is configured (#3514) each_with_object ignores the return value of the supplied block; you need to mutate the passed object instead. Prior to this change, the ramifications of bug are that: * FilterField#permitted_params always includes empty hashes (the original, unmutated object we passed to each_with_object) for a facet pivot field. * When Blacklight::Parameters::deep_merge_permitted_params comes across empty hashes, it discards a present hash in favor of the empty one. * As the permitted params for all facet fields are merged together, the presence of even one facet pivot field leads us to discard all other permitted facet field keys. * We have empty hashes, rather than hashes with permitted facet keys going into Blacklight::Parameters#deep_unmangle_params! * Blacklight::Parameters#deep_unmangle_params! can find no permitted parameters that it needs to unmangle, so the facebook params never get unmangled, causing errors and unexpected behavior elsewhere in the stack. * Facebook-style query params don't work if a facet pivot is configured. Co-authored-by: Christina Chortaria <christinach@users.noreply.github.com>
seanaery
approved these changes
Feb 24, 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.
Backports of the following 3 pull requests: