diff --git a/app/models/concerns/rights_concern.rb b/app/models/concerns/rights_concern.rb index a5a68e09..16ca8f0c 100644 --- a/app/models/concerns/rights_concern.rb +++ b/app/models/concerns/rights_concern.rb @@ -4,7 +4,7 @@ module RightsConcern extend Geoblacklight::SolrDocument def rights_text - "This dataset is only available to members of the New York University community and is limited to current students, staff, and faculty. Do not copy or redistribute this data. If you have questions about what constitutes fair use of this material, please contact us directly at data.services@nyu.edu.

Please note that access while on the NYU wifi network or via NYU VPN is required to preview the data below; authenticated users may use the asset download features without NYU VPN." if nyu? && restricted? + "This dataset is only available to members of the New York University community and is limited to current students, staff, and faculty. Do not copy or redistribute this data. If you have questions about what constitutes fair use of this material, please contact us directly at data.services@nyu.edu.

In order to download the data, click on the hdl.handle.net link at the bottom of the record." if nyu? && restricted? end def nyu? diff --git a/app/views/catalog/_show_downloads.html.erb b/app/views/catalog/_show_downloads.html.erb index c8e26271..24848e88 100644 --- a/app/views/catalog/_show_downloads.html.erb +++ b/app/views/catalog/_show_downloads.html.erb @@ -14,10 +14,4 @@ <% end %> -<% elsif document.restricted? && document.same_institution? %> -
-
- <%= link_to t('geoblacklight.tools.login_to_view'), user_shibboleth_omniauth_authorize_path, method: :post, class: ['btn', 'btn-default'] %> -
-
<% end %> diff --git a/app/views/shared/_user_util_links.html.erb b/app/views/shared/_user_util_links.html.erb index faec48e6..ab499ece 100644 --- a/app/views/shared/_user_util_links.html.erb +++ b/app/views/shared/_user_util_links.html.erb @@ -11,10 +11,6 @@ - <% else %> - <% end %> <% end %> diff --git a/spec/features/show_page_spec.rb b/spec/features/show_page_spec.rb index 82ad4adc..8be00ea9 100644 --- a/spec/features/show_page_spec.rb +++ b/spec/features/show_page_spec.rb @@ -3,22 +3,22 @@ describe 'Show page' do context 'with restricted NYU result - nyu-2451-34626' do context 'when signed out' do - it 'the displays warning message' do + it 'displays warning message' do visit solr_document_path 'nyu-2451-34626' expect(page).to have_content 'This dataset is only available to members of the New York University community' end + it 'displays the download message' do + visit solr_document_path 'nyu-2451-34626' + expect(page).to have_content 'In order to download the data' + end + it 'does not display download' do visit solr_document_path 'nyu-2451-34626' # rubocop:disable Capybara/NegationMatcherAfterVisit expect(page).to have_no_content 'Export' # rubocop:enable Capybara/NegationMatcherAfterVisit end - - it 'includes link to login' do - visit solr_document_path 'nyu-2451-34626' - expect(page).to have_link('Login to View and Download') - end end context 'when signed in' do