diff --git a/app/controllers/concerns/blacklight/bookmarks.rb b/app/controllers/concerns/blacklight/bookmarks.rb index 5143cb6cad..12750666a6 100644 --- a/app/controllers/concerns/blacklight/bookmarks.rb +++ b/app/controllers/concerns/blacklight/bookmarks.rb @@ -42,7 +42,11 @@ def index @bookmarks = token_or_current_or_guest_user.bookmarks bookmark_ids = @bookmarks.collect { |b| b.document_id.to_s } @response, deprecated_document_list = search_service.fetch(bookmark_ids) - @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_document_list, "The @document_list instance variable is now deprecated and will be removed in Blacklight 8.0") + @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new( + deprecated_document_list, + "The @document_list instance variable is now deprecated", + ActiveSupport::Deprecation.new("8.0", "blacklight") + ) respond_to do |format| format.html {} diff --git a/app/controllers/concerns/blacklight/catalog.rb b/app/controllers/concerns/blacklight/catalog.rb index bb9d1ea724..8a36ad6b44 100644 --- a/app/controllers/concerns/blacklight/catalog.rb +++ b/app/controllers/concerns/blacklight/catalog.rb @@ -34,7 +34,11 @@ module Blacklight::Catalog def index (@response, deprecated_document_list) = search_service.search_results - @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_document_list, 'The @document_list instance variable is deprecated; use @response.documents instead.') + @document_list = ActiveSupport::Deprecation::DeprecatedObjectProxy.new( + deprecated_document_list, + 'The @document_list instance variable is deprecated; use @response.documents instead.', + ActiveSupport::Deprecation.new("8.0", "blacklight") + ) respond_to do |format| format.html { store_preferred_view } @@ -53,7 +57,11 @@ def index # to add responses for formats other than html or json see _Blacklight::Document::Export_ def show deprecated_response, @document = search_service.fetch(params[:id]) - @response = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(deprecated_response, 'The @response instance variable is deprecated; use @document.response instead.') + @response = ActiveSupport::Deprecation::DeprecatedObjectProxy.new( + deprecated_response, + 'The @response instance variable is deprecated; use @document.response instead.', + ActiveSupport::Deprecation.new("8.0", "blacklight") + ) respond_to do |format| format.html { @search_context = setup_next_and_previous_documents }