Enable new functionality for pagination information on grouped results #2140
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
cbeer
reviewed
Sep 19, 2019
| # grouped key specific i18n keys. `key` is the field being grouped | ||
| def entry_name(options) | ||
| begin | ||
| I18n.t("blacklight.entry_name.grouped.#{key}", raise: true) |
There was a problem hiding this comment.
I think this can be collapsed using I18n fallbacks (and its pluralization methods?), something like:
I18n.t("blacklight.entry_name.grouped.#{key}", default: 'blacklight.entry_name.grouped.default', count: options[:count])There was a problem hiding this comment.
👍 I opted to leave the count out as that would require additional keys. Just using the rails helper for pluralization.
mejackreed
force-pushed
the
pagination-update
branch
from
15720b2
to
dc4ff43
Compare
…to have pushed this into the model
mejackreed
force-pushed
the
pagination-update
branch
from
a4fe97c
to
4e77f7a
Compare
dkinzer
reviewed
Nov 4, 2019
| options[:entry_name] | ||
| elsif collection.respond_to? :model # DataMapper | ||
| collection.model.model_name.human.downcase | ||
| elsif collection.respond_to?(:model_name) && !collection.model_name.nil? # AR, Blacklight::PaginationMethods |
There was a problem hiding this comment.
This change is breaking our site which uses both solr and non solr documents. because collection.model_name.downcase throws an error when collection.model_name is nil.
dkinzer
reviewed
Nov 4, 2019
| else | ||
| t('blacklight.entry_name.default') | ||
| collection.entry_name(count: collection.size).downcase |
There was a problem hiding this comment.
Actually our issue is when collection.entry_name returns nil we get an error. We pushed up a PR to fix this.
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.
Enables projectblacklight/arclight#699 and replacing approach in projectblacklight/arclight#775.
A few things about this pull request. At first I aimed to target removal of
page_entries_infoin a Blacklight 8 release by removing our custom i18n keys and just using Kaminari's. This would have worked except for the two remaining Blacklight needs:We could accmmodate either one of those I think independently, but together I couldn't figure out a way to successfully push that to the
Blacklight::Solr::Responsein a sane way.I've hopefully simplified this method a bit so that future Blacklight maintainers have an easier time. 🤞