diff --git a/app/helpers/blacklight_display_helper.rb b/app/helpers/blacklight_display_helper.rb index 7aaf56a..dd740dc 100644 --- a/app/helpers/blacklight_display_helper.rb +++ b/app/helpers/blacklight_display_helper.rb @@ -62,7 +62,7 @@ def download_links(document) content_tag(:span, link_to(tag.i(class: 'fa fa-download download-link-fa') + "Download #{name}", Rails.application.routes.url_helpers.final_submission_file_path(final_submission_id), - class: 'file-link form-control')) + data: { confirm: document.confirmation }, class: 'file-link form-control')) ) end diff --git a/app/models/solr_document.rb b/app/models/solr_document.rb index c480fb7..c7c0094 100644 --- a/app/models/solr_document.rb +++ b/app/models/solr_document.rb @@ -68,4 +68,12 @@ def defense def defended_at fetch(:defended_at_dtsi, nil) end + + def restricted_to_institution? + access_level.current_access_level == 'restricted_to_institution' + end + + def confirmation + I18n.t('registered.confirmation') if restricted_to_institution? + end end diff --git a/config/locales/en.yml b/config/locales/en.yml index 45898e5..0879b93 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -30,8 +30,6 @@ # available at https://guides.rubyonrails.org/i18n.html. en: - hello: "Hello world" - graduate: program: label: Graduate Program @@ -56,4 +54,7 @@ en: list: label: Thesis Supervisor - libraries_help_link: https://libraries.psu.edu/website-feedback \ No newline at end of file + libraries_help_link: https://libraries.psu.edu/website-feedback + + registered: + confirmation: 'You are attempting to download information that is restricted to the Penn State University community. By clicking OK you acknowledge that the information downloaded should not be dispersed, used, or reproduced for any purposes outside of the University community.' diff --git a/lib/tasks/solr.rake b/lib/tasks/solr.rake index 785e139..132108c 100644 --- a/lib/tasks/solr.rake +++ b/lib/tasks/solr.rake @@ -7,8 +7,8 @@ namespace :solr do desc 'Reset Solr' task reset: :environment do conf = EtdaExplore::SolrAdmin.new - conf.delete_all_collections - conf.delete_all_configsets + conf.delete_collection + conf.delete_configset Rake::Task['solr:init'].invoke end diff --git a/spec/helpers/blacklight_display_helper_spec.rb b/spec/helpers/blacklight_display_helper_spec.rb index 616c66b..3f464f3 100644 --- a/spec/helpers/blacklight_display_helper_spec.rb +++ b/spec/helpers/blacklight_display_helper_spec.rb @@ -62,7 +62,7 @@ it 'returns a link for open access and restricted to institution submissions' do expect(render_download_links(oa_doc)).to eq "Download #{oa_doc[:document][:file_name_ssim].first}" - expect(render_download_links(rti_doc)).to eq "Download #{rti_doc[:document][:file_name_ssim].first}" + expect(render_download_links(rti_doc)).to eq "Download #{rti_doc[:document][:file_name_ssim].first}" expect(render_download_links(r_doc)).to eq '

No files available due to restrictions.

' end end