Skip to content

Support both blacklight 6 and 7 in 7.0.x line #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
cjcolvar wants to merge 2 commits into
base: release-7.0.x
Choose a base branch
from
Draft

Support both blacklight 6 and 7 in 7.0.x line #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21611e
Load different search entry based on blacklight version
MPLSFedResearchTZ Sep 15, 2022
7b6c4ba
Test on BL7 and BL6
cjcolvar Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,29 @@ on:
jobs:
test:
runs-on: ubuntu-latest
name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }})
name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }}) / blacklight ${{matrix.blacklight_version}}
strategy:
matrix:
ruby: [2.7, '3.0']
rails_version: ['6.1.5', '7.0.2.3']
blacklight_version: ['7.29.0']
additional_engine_cart_rails_options: ['']
include:
- ruby: '2.7'
rails_version: '5.2.4.2'
blacklight_version: '6.25.0'
- ruby: '2.7'
rails_version: '5.2.4.2'
blacklight_version: '7.29.0'
- ruby: '3.1'
rails_version: '7.0.2.3'
blacklight_version: '7.29.0'
- ruby: '3.0'
rails_version: '7.0.2.3'
blacklight_version: '7.29.0'
env:
RAILS_VERSION: ${{ matrix.rails_version }}
BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.engine_cart_rails_options }}"
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 4 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,9 @@ else
when /^5.[12]/, /^6.0/
gem 'sass-rails', '~> 5.0'
end

if ENV['BLACKLIGHT_VERSION']
gem 'blacklight', ENV['BLACKLIGHT_VERSION']
end
end
# END ENGINE_CART BLOCK
10 changes: 8 additions & 2 deletions lib/blacklight_range_limit/controller_override.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,14 @@ def range_limit
# field (with start/end params) mentioned in query params
# range_field, range_start, and range_end

@response, _ = search_service.search_results do |search_builder|
search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
if Gem.loaded_specs['blacklight'].version.to_s.start_with?('6.')
@response, _ = search_results(params) do |search_builder|
search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
end
else
@response, _ = search_service.search_results do |search_builder|
search_builder.except(:add_range_limit_params).append(:fetch_specific_range_limit)
end
end
render('blacklight_range_limit/range_segments', :locals => {:solr_field => params[:range_field]}, :layout => !request.xhr?)
end
Expand Down