diff --git a/app/views/author/submissions/_access_level_standard.html.erb b/app/views/author/submissions/_access_level_standard.html.erb
index 87d159125..d5757c748 100644
--- a/app/views/author/submissions/_access_level_standard.html.erb
+++ b/app/views/author/submissions/_access_level_standard.html.erb
@@ -7,6 +7,7 @@
<% end %>
<% AccessLevel.display.each do |k| %>
+ <% next if k[:type] == 'restricted_liberal_arts' && (@submission.academic_program != 'LA' || !current_partner.graduate?) %>
<% value = k[:type] %>
<% id = "submission_access_level_#{value}" %>
<% desc_id = "#{id}-desc" %>
diff --git a/app/views/author/submissions/_access_level_static.html.erb b/app/views/author/submissions/_access_level_static.html.erb
index 008b39cb2..0512203a5 100644
--- a/app/views/author/submissions/_access_level_static.html.erb
+++ b/app/views/author/submissions/_access_level_static.html.erb
@@ -3,6 +3,7 @@
<%= f.input :access_level, as: :hidden, input_html: { value: "#{@submission.access_level}" } %>
<% AccessLevel.display.each do |k| %>
+ <% next if k[:type] == 'restricted_liberal_arts' %>
- <%= k[:label] %> -- <%= k[:description].html_safe %>
<%= render partial: 'restricted_note_field', locals: {f: f} if @view.psu_only(k[:label]) %>
<%= render partial: 'invention_disclosure_information', locals: {f: f} if k[:label] == 'Restricted' %>
diff --git a/config/locales/partners/en/graduate/graduate.en.yml b/config/locales/partners/en/graduate/graduate.en.yml
index bf3ee3be1..258dbc80a 100644
--- a/config/locales/partners/en/graduate/graduate.en.yml
+++ b/config/locales/partners/en/graduate/graduate.en.yml
@@ -345,6 +345,10 @@ en:
restricted_to_institution_attr:
description_html: 'Access restricted to individuals having a valid Penn State Access Account, for a period of two years. Allows restricted access of the entire work beginning immediately after degree conferral. At the end of the two-year period, the status will automatically change to Open Access. Intended for use by authors in cases where prior public release of the work may compromise its acceptance for publication.'
scope: final_restricted_institution
+ restricted_liberal_arts: 'Restricted (Liberal Arts Only)'
+ restricted_liberal_arts_attr:
+ description_html: 'Immediately after the conferral of the degree, the abstract becomes accessible worldwide. All other parts of the document are restricted to Penn State only for an embargo period of five (5) years for dissertations/thesis from the College of the Liberal Arts. No extensions will be granted beyond five (5) years.'
+ scope: final_restricted_institution
restricted: 'Restricted'
restricted_attr:
description_html: 'Restricts the entire work for the purpose of filing a patent. At the end of the two-year period, the status will automatically change to Open Access. Selection of this option requires that an invention disclosure (ID) be filed with the Office of Technology Management (OTM) prior to submission of the final thesis/dissertation, and confirmed by OTM.'
diff --git a/spec/integration/admin/submissions/admin_access_level_spec.rb b/spec/integration/admin/submissions/admin_access_level_spec.rb
index fdece7f73..d85a70220 100644
--- a/spec/integration/admin/submissions/admin_access_level_spec.rb
+++ b/spec/integration/admin/submissions/admin_access_level_spec.rb
@@ -53,5 +53,37 @@
click_button('Update Metadata Only')
expect(page).not_to have_content('Invention disclosure number is required for Restricted submissions.')
end
+
+ context 'when author is in college of liberal arts' do
+ before do
+ submission.update(academic_program: 'LA')
+ page.refresh
+ end
+
+ if current_partner.graduate?
+ it 'has a restricted_liberal_arts radio button' do
+ page.find("input#submission_access_level_restricted_liberal_arts").click
+ expect(page.find("input#submission_access_level_restricted_liberal_arts")).to be_checked
+ expect(page).to have_field('submission_invention_disclosures_attributes_0_id_number')
+ end
+ end
+
+ unless current_partner.graduate?
+ it 'does not have a restricted_liberal_arts radio button' do
+ expect(page).not_to have_selector("input#submission_access_level_restricted_liberal_arts")
+ end
+ end
+ end
+
+ context 'when author is not in college of liberal arts' do
+ before do
+ submission.update(academic_program: 'CA')
+ page.refresh
+ end
+
+ it 'does not have a restricted_liberal_arts radio button' do
+ expect(page).not_to have_selector("input#submission_access_level_restricted_liberal_arts")
+ end
+ end
end
end
diff --git a/spec/integration/author/submission_access_level_spec.rb b/spec/integration/author/submission_access_level_spec.rb
index eff5bb2de..5215a2259 100644
--- a/spec/integration/author/submission_access_level_spec.rb
+++ b/spec/integration/author/submission_access_level_spec.rb
@@ -47,6 +47,39 @@
expect(page).not_to have_content('Invention disclosure number is required for Restricted submissions.')
end
end
+
+ context 'when author is in college of liberal arts' do
+ before do
+ submission.update(academic_program: 'LA')
+ page.refresh
+ end
+
+ if current_partner.graduate?
+ it 'has a restricted_liberal_arts radio button' do
+ page.find("input#submission_access_level_restricted_liberal_arts").click
+ expect(page.find("input#submission_access_level_restricted_liberal_arts")).to be_checked
+ expect(page).not_to have_content('Enter justification')
+ expect(page).not_to have_field('submission_invention_disclosures_attributes_0_id_number')
+ end
+ end
+
+ unless current_partner.graduate?
+ it 'does not have a restricted_liberal_arts radio button' do
+ expect(page).not_to have_selector("input#submission_access_level_restricted_liberal_arts")
+ end
+ end
+ end
+
+ context 'when author is not in college of liberal arts' do
+ before do
+ submission.update(academic_program: 'CA')
+ page.refresh
+ end
+
+ it 'does not have a restricted_liberal_arts radio button' do
+ expect(page).not_to have_selector("input#submission_access_level_restricted_liberal_arts")
+ end
+ end
end
context 'milsch authors cannot choose the access level', :milsch do
diff --git a/spec/models/access_level_spec.rb b/spec/models/access_level_spec.rb
index e8d5a54da..bfa9ea06a 100755
--- a/spec/models/access_level_spec.rb
+++ b/spec/models/access_level_spec.rb
@@ -6,15 +6,17 @@
let(:open_access_view_struct) { { type: 'open_access', label: 'Open Access', description: EtdaUtilities::AccessLevel.partner_access_levels['access_level']['open_access_attr']['description_html'] } }
let(:restricted_view_struct) { { type: 'restricted', label: 'Restricted', description: EtdaUtilities::AccessLevel.partner_access_levels['access_level']['restricted_attr']['description_html'] } }
let(:restricted_to_institution_view_struct) { { type: 'restricted_to_institution', label: 'Restricted (Penn State Only)', description: EtdaUtilities::AccessLevel.partner_access_levels['access_level']['restricted_to_institution_attr']['description_html'] } }
+ let(:restricted_liberal_arts_view_struct) { { type: 'restricted_liberal_arts', label: 'Restricted (Liberal Arts Only)', description: EtdaUtilities::AccessLevel.partner_access_levels['access_level']['restricted_liberal_arts_attr']['description_html'] } }
describe '#ACCESS_LEVEL_KEYS' do
it 'constant containing all access levels' do
- expect(described_class::ACCESS_LEVEL_KEYS).to contain_exactly('open_access', 'restricted_to_institution', 'restricted', '')
+ expect(described_class::ACCESS_LEVEL_KEYS).to contain_exactly('open_access', 'restricted_to_institution', 'restricted', 'restricted_liberal_arts', '')
expect(described_class::ACCESS_LEVEL_KEYS).to include('open_access')
expect(described_class::ACCESS_LEVEL_KEYS).to include('restricted')
expect(described_class::ACCESS_LEVEL_KEYS).to include('restricted_to_institution')
+ expect(described_class::ACCESS_LEVEL_KEYS).to include('restricted_liberal_arts')
expect(described_class::ACCESS_LEVEL_KEYS).to include('')
- expect(described_class::ACCESS_LEVEL_KEYS.length).to eq(4)
+ expect(described_class::ACCESS_LEVEL_KEYS.length).to eq(5)
end
end
@@ -45,14 +47,17 @@
expect(described_class.paper_access_levels).to include(open_access_view_struct)
expect(described_class.paper_access_levels).to include(restricted_view_struct)
expect(described_class.paper_access_levels).to include(restricted_to_institution_view_struct)
+ expect(described_class.paper_access_levels).to include(restricted_liberal_arts_view_struct)
end
end
describe 'ordering' do
- it "levels should evaluate int he correct order" do
+ it "levels should evaluate in the correct order" do
expect(described_class.OPEN_ACCESS.to_i < described_class.RESTRICTED.to_i).to be_truthy
expect(described_class.OPEN_ACCESS.to_i < described_class.RESTRICTED_TO_INSTITUTION.to_i).to be_truthy
+ expect(described_class.OPEN_ACCESS.to_i < described_class.RESTRICTED_LIBERAL_ARTS.to_i).to be_truthy
expect(described_class.RESTRICTED_TO_INSTITUTION.to_i < described_class.RESTRICTED.to_i).to be_truthy
+ expect(described_class.RESTRICTED_LIBERAL_ARTS.to_i < described_class.RESTRICTED.to_i).to be_truthy
end
end
end
diff --git a/spec/models/concerns/admin_statuses.rb b/spec/models/concerns/admin_statuses.rb
index bc2a4d16d..68373ca89 100644
--- a/spec/models/concerns/admin_statuses.rb
+++ b/spec/models/concerns/admin_statuses.rb
@@ -78,11 +78,22 @@
end
context 'when the admin status is final_restricted_institution' do
- it 'returns the correct label' do
- status = 'final_restricted_institution'
- submission = Submission.new(status: 'released for publication!!!',
- access_level: 'restricted_to_institution')
- expect(submission.admin_status).to eq I18n.t!("#{current_partner.id}.admin_filters.#{status}.title")
+ context 'when access level is restricted to institution' do
+ it 'returns the correct label' do
+ status = 'final_restricted_institution'
+ submission = Submission.new(status: 'released for publication!!!',
+ access_level: 'restricted_to_institution')
+ expect(submission.admin_status).to eq I18n.t!("#{current_partner.id}.admin_filters.#{status}.title")
+ end
+ end
+
+ context 'when access level is restricted liberal arts' do
+ it 'returns the correct label' do
+ status = 'final_restricted_institution'
+ submission = Submission.new(status: 'released for publication!!!',
+ access_level: 'restricted_liberal_arts')
+ expect(submission.admin_status).to eq I18n.t!("#{current_partner.id}.admin_filters.#{status}.title")
+ end
end
end
diff --git a/spec/models/solr_submission_spec.rb b/spec/models/solr_submission_spec.rb
index 6061810a8..fec2d6de7 100644
--- a/spec/models/solr_submission_spec.rb
+++ b/spec/models/solr_submission_spec.rb
@@ -17,6 +17,8 @@
final_submission_files_uploaded_at: DateTime.now,
# Test that nil stays nil
defended_at: nil,
+ # Test that restricted liberal arts maps to restricted to institution
+ access_level: 'restricted_liberal_arts',
program_id: program.id
end
let(:final_submission_file_1) { create :final_submission_file }
@@ -26,6 +28,7 @@
let(:committee_member_2) { create :committee_member }
let(:program) { create :program, name: 'Mechanical Engineering (DED)' }
let(:program_name_condensed) { 'Mechanical Engineering' }
+ let(:converted_access_level) { 'restricted_to_institution' }
it 'generates solr doc from submission attributes' do
submission.committee_members << committee_member_1
@@ -36,7 +39,7 @@
submission.save
expect(solr_submission.to_solr).to eq({
"abstract_tesi" => submission.abstract,
- "access_level_ss" => submission.access_level,
+ "access_level_ss" => converted_access_level,
"author_name_tesi" => "#{submission.author_last_name}, #{submission.author_first_name} #{submission.author_middle_name}",
"committee_member_and_role_tesim" => ["#{committee_member_1.name}, #{committee_member_1.committee_role.name}",
"#{committee_member_2.name}, #{committee_member_2.committee_role.name}"],
diff --git a/spec/models/submission_spec.rb b/spec/models/submission_spec.rb
index 28b3ee508..c67ba319c 100755
--- a/spec/models/submission_spec.rb
+++ b/spec/models/submission_spec.rb
@@ -135,9 +135,15 @@
access_level: 'restricted_to_institution',
status: 'waiting for publication release'
end
+ let!(:sub6) do
+ FactoryBot.create :submission,
+ released_for_publication_at: Time.zone.today.days_ago(1),
+ access_level: 'restricted_liberal_arts',
+ status: 'released for publication metadata only'
+ end
it 'returns submissions that are ready for autorelease' do
- expect(described_class.ok_to_autorelease).to contain_exactly(sub1, sub2)
+ expect(described_class.ok_to_autorelease).to contain_exactly(sub1, sub2, sub6)
end
end
@@ -165,9 +171,21 @@
released_for_publication_at: Time.zone.today + 6.weeks,
released_metadata_at: Time.zone.today.years_ago(1)
end
+ let!(:sub5) do
+ FactoryBot.create :submission,
+ released_for_publication_at: Time.zone.today.next_month,
+ released_metadata_at: Time.zone.today.years_ago(4),
+ access_level: 'restricted_liberal_arts'
+ end
+ let!(:sub6) do
+ FactoryBot.create :submission,
+ released_for_publication_at: Time.zone.today.next_month,
+ released_metadata_at: Time.zone.today.years_ago(6),
+ access_level: 'restricted_liberal_arts'
+ end
- it 'returns submissions that are ready for autorelease' do
- expect(described_class.release_warning_needed?).to contain_exactly(sub1)
+ it 'returns submissions that need a release warning' do
+ expect(described_class.release_warning_needed?).to contain_exactly(sub1, sub5)
end
end
@@ -830,6 +848,13 @@
date_to_release = Time.zone.tomorrow
expect(submission.publication_release_date(date_to_release)).to eq(date_to_release + 2.years)
end
+
+ it 'returns the release date plus 5 years for submissions not yet published and are liberal arts restricted' do
+ submission = FactoryBot.create :submission, :waiting_for_publication_release
+ submission.access_level = 'restricted_liberal_arts'
+ date_to_release = Time.zone.tomorrow
+ expect(submission.publication_release_date(date_to_release)).to eq(date_to_release + 5.years)
+ end
end
context 'update timestamps' do
diff --git a/spec/presenters/admin/submission_form_view_spec.rb b/spec/presenters/admin/submission_form_view_spec.rb
index 6cdb910c2..e33413841 100644
--- a/spec/presenters/admin/submission_form_view_spec.rb
+++ b/spec/presenters/admin/submission_form_view_spec.rb
@@ -141,13 +141,26 @@
end
context "When the status is 'psu-only'" do
- before do
- submission.status = 'released for publication'
- submission.access_level = 'restricted_to_institution'
- end
-
- it "returns 'final_restricted_institution'" do
- expect(view.actions_partial_name).to eq 'restricted_institution_actions'
+ context 'when access level is restricted to institution' do
+ before do
+ submission.status = 'released for publication'
+ submission.access_level = 'restricted_to_institution'
+ end
+
+ it "returns 'final_restricted_institution'" do
+ expect(view.actions_partial_name).to eq 'restricted_institution_actions'
+ end
+ end
+
+ context 'when access level is restricted to liberal arts' do
+ before do
+ submission.status = 'released for publication'
+ submission.access_level = 'restricted_liberal_arts'
+ end
+
+ it "returns 'final_restricted_institution'" do
+ expect(view.actions_partial_name).to eq 'restricted_institution_actions'
+ end
end
end
end
diff --git a/spec/presenters/author/final_submission_files_view_spec.rb b/spec/presenters/author/final_submission_files_view_spec.rb
index cbb98d6d5..11b57f1db 100644
--- a/spec/presenters/author/final_submission_files_view_spec.rb
+++ b/spec/presenters/author/final_submission_files_view_spec.rb
@@ -74,6 +74,13 @@
end
end
+ context 'restricted_liberal_arts' do
+ it 'returns restricted_liberal_arts label' do
+ submission.access_level = 'restricted_liberal_arts'
+ expect(view.selected_access_level).to eq(submission.current_access_level.label)
+ end
+ end
+
context 'restricted' do
it 'returns restricted label' do
submission.access_level = 'restricted'
diff --git a/spec/services/auto_release_service_spec.rb b/spec/services/auto_release_service_spec.rb
index e0c4049ff..e06dd7cb8 100644
--- a/spec/services/auto_release_service_spec.rb
+++ b/spec/services/auto_release_service_spec.rb
@@ -35,12 +35,18 @@
access_level: 'restricted_to_institution',
status: 'waiting for publication release'
end
+ let!(:sub6) do
+ FactoryBot.create :submission,
+ released_for_publication_at: Time.zone.today.days_ago(1),
+ access_level: 'restricted_liberal_arts',
+ status: 'released for publication metadata only'
+ end
- before { allow(Submission).to receive(:release_for_publication).with([sub1.id, sub3.id], DateTime.now.end_of_day, 'Release as Open Access') }
+ before { allow(Submission).to receive(:release_for_publication).with([sub1.id, sub3.id, sub6.id], DateTime.now.end_of_day, 'Release as Open Access') }
it 'sends eligible submissions for release to publication' do
described_class.new.release
- expect(Submission).to have_received(:release_for_publication).with([sub1.id, sub3.id], DateTime.now.end_of_day, 'Release as Open Access')
+ expect(Submission).to have_received(:release_for_publication).with([sub1.id, sub3.id, sub6.id], DateTime.now.end_of_day, 'Release as Open Access')
end
end
diff --git a/spec/services/submission_release_service_spec.rb b/spec/services/submission_release_service_spec.rb
index b2309c269..a2e675efb 100644
--- a/spec/services/submission_release_service_spec.rb
+++ b/spec/services/submission_release_service_spec.rb
@@ -36,6 +36,18 @@
end
end
+ context "when submission's access_level is restricted_liberal_arts" do
+ let(:submission) do
+ FactoryBot.create :submission, :waiting_for_publication_release, access_level: 'restricted_liberal_arts'
+ end
+
+ it "changes the submission's status to 'released for publication metadata only'" do
+ service.publish([submission.id], DateTime.now, release_type)
+ submission.reload
+ expect(submission.status).to eq 'released for publication metadata only'
+ end
+ end
+
context "when submission's access_level is restricted" do
let(:submission) do
FactoryBot.create :submission, :waiting_for_publication_release, access_level: 'restricted_to_institution'