Skip to content
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.

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

Upgrade blacklight_range_limit #1935

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ gem 'sitemap_generator'
gem 'blacklight-gallery', '~> 4.2'
gem 'blacklight-hierarchy', '~> 6.1'
gem 'blacklight-oembed', '>= 0.1.0'
gem 'blacklight_range_limit', '~> 8.0'
gem 'blacklight_range_limit', '~> 9.0'
gem 'rails_autolink'
gem 'rsolr', '>= 1.0'

Expand Down
5 changes: 2 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,8 @@ GEM
signet
tophat
view_component (>= 2.66, < 4)
blacklight_range_limit (8.5.0)
blacklight_range_limit (9.0.0)
blacklight (>= 7.25.2, < 9)
deprecation
view_component (>= 2.54, < 4)
bootsnap (1.18.4)
msgpack (~> 1.2)
Expand Down Expand Up @@ -795,7 +794,7 @@ DEPENDENCIES
blacklight-hierarchy (~> 6.1)
blacklight-oembed (>= 0.1.0)
blacklight-spotlight (~> 4.0)
blacklight_range_limit (~> 8.0)
blacklight_range_limit (~> 9.0)
bootsnap (>= 1.4.4)
bootstrap_form (~> 4.5)
cache_with_locale
Expand Down
2 changes: 0 additions & 2 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@
//

//= require_tree .

//= require 'blacklight_range_limit'
6 changes: 3 additions & 3 deletions app/controllers/spotlight/home_pages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ class HomePagesController

# rubocop:disable Rails/LexicallyScopedActionFilter
# Tweak the authorization for the range limit actions
before_action :authenticate_user!, except: %i[show range_limit range_limit_panel]
skip_authorize_resource only: %i[range_limit range_limit_panel]
before_action :authenticate_user!, except: %i[show range_limit]
skip_authorize_resource only: %i[range_limit]

before_action only: %i[range_limit range_limit_panel] do
before_action only: %i[range_limit] do
authorize! :read, @page
end
# rubocop:enable Rails/LexicallyScopedActionFilter
Expand Down
2 changes: 2 additions & 0 deletions app/javascript/entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ export const i18n = new I18n()

import 'transform_result'
import 'blacklight-hierarchy'
import 'openseadragon-rails'
import 'blacklight-range-limit'
2 changes: 2 additions & 0 deletions config/importmap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@
pin "openseadragon" # @5.0.1
pin 'blacklight-frontend', to: 'blacklight/index.js'
pin "blacklight-hierarchy" # @6.4.0
pin "chart.js", to: "https://ga.jspm.io/npm:[email protected]/dist/chart.js"
pin "@kurkle/color", to: "https://ga.jspm.io/npm:@kurkle/[email protected]/dist/color.esm.js"
Loading