There was an error loading this file.
', - features: ['playpause', 'current', 'progress', 'duration', 'tracks', 'volume', 'fullscreen', 'branding'], - stretching: 'responsive', - toggleCaptionsButtonWhenOnlyOne: true - }) - }); -}); diff --git a/app/javascript/src/upload/current-student.js b/app/javascript/src/upload/current-student.js index 3b19ce4f..d25ae028 100644 --- a/app/javascript/src/upload/current-student.js +++ b/app/javascript/src/upload/current-student.js @@ -1,10 +1,22 @@ $(document).ready(function () { + // onChange only fires when radio button is selected + $("form#upload input#deposit_current_student_true") + .change(function () { + document.getElementsByClassName("student-section")[0].style.display = + "block"; + }) + .change(); - $('form#upload input#deposit_current_student').change(function () { - document.getElementsByClassName('student-section')[0].style.display = "none"; - if (document.getElementById('deposit_current_student').checked == true) { - document.getElementsByClassName('student-section')[0].style.display = "block"; - } - }).change(); + $("form#upload input#deposit_current_student_false") + .change(function () { + document.getElementsByClassName("student-section")[0].style.display = + "none"; + }) + .change(); + //check if button is already selected on page render, ie after validation failure + if ($("form#upload input#deposit_current_student_true").is(":checked")) { + document.getElementsByClassName("student-section")[0].style.display = + "block"; + } }); diff --git a/app/models/deposit.rb b/app/models/deposit.rb index 1995aee8..403c2796 100644 --- a/app/models/deposit.rb +++ b/app/models/deposit.rb @@ -28,7 +28,7 @@ class Deposit < ApplicationRecord }.freeze before_validation :clean_up_creators - before_save :convert_embargo_value_to_date_string, :finalize_notes_contents + before_save :finalize_notes_contents # validates_presence_of :agreement_version # validates_presence_of :name @@ -41,7 +41,7 @@ class Deposit < ApplicationRecord validate :one_creator_must_be_present, on: :create validate :cco_must_be_selected, if: proc { |a| a.rights == RIGHTS_OPTIONS['No Copyright'] } validates :title, :abstract, :year, :rights, :files, presence: true, on: :create - validates :previously_published, inclusion: { in: [true, false] }, on: :create + validates :previously_published, :current_student, inclusion: { in: [true, false] }, on: :create validates :rights, inclusion: { in: RIGHTS_OPTIONS.values }, on: :create validates :license, inclusion: { in: LICENSE_OPTIONS }, on: :create, if: proc { |a| a.license.present? } validates :degree_program, :academic_advisor, :thesis_or_dissertation, @@ -180,21 +180,12 @@ def finalize_notes_contents #{self.notes} Degree Program: #{self.degree_program} - Advisor Name: #{self.academic_advisor} + Academic Advisor: #{self.academic_advisor} Thesis or Dissertation: #{self.thesis_or_dissertation} Degree Earned: #{self.degree_earned} - Embargo Date: #{self.embargo_date} + Embargo Year(s): #{self.embargo_date} Previously Published: #{self.previously_published} Article Version: #{self.article_version} Keywords: #{self.keywords} TEXT end - -def convert_embargo_value_to_date_string - return self.embargo_date = '' unless embargo_date&.present? - - embargo_date_int = Integer(self.embargo_date) - return self.embargo_date = '' unless embargo_date_int.positive? - - self.embargo_date = embargo_date_int.year.from_now.strftime('%-Y-%-m-%-y') -end diff --git a/app/views/uploads/new.html.erb b/app/views/uploads/new.html.erb index 717500f5..235e0521 100644 --- a/app/views/uploads/new.html.erb +++ b/app/views/uploads/new.html.erb @@ -72,10 +72,13 @@ -Are you a current student at Columbia or one of its affiliate institutions?
+ <%= form.radio_button(:current_student, true) %> + <%= form.label(:current_student, 'Yes') %> + <%= form.radio_button(:current_student, false) %> + <%= form.label(:current_student, 'No') %>(If you are uploading a thesis, please give us the name of your thesis advisor.)
<%= form.text_field(:academic_advisor) %>