diff --git a/app/forms/hyrax/article_form.rb b/app/forms/hyrax/article_form.rb index db76ac75b..52c3e3afe 100755 --- a/app/forms/hyrax/article_form.rb +++ b/app/forms/hyrax/article_form.rb @@ -21,7 +21,7 @@ class ArticleForm < ::SingleValueForm self.single_value_fields = [:title, :license] self.admin_only_terms = [:dcmi_type, :admin_note, :bibliographic_citation, :copyright_date, :date_captured, :date_other, - :digital_collection, :doi, :extent, :identifier, :rights_holder, :translator] + :digital_collection, :doi, :extent, :identifier, :rights_holder, :translator, :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Text'], language: ['http://id.loc.gov/vocabulary/iso639-2/eng'], rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/' } diff --git a/app/forms/hyrax/artwork_form.rb b/app/forms/hyrax/artwork_form.rb index a4204271b..96fc3e3b0 100644 --- a/app/forms/hyrax/artwork_form.rb +++ b/app/forms/hyrax/artwork_form.rb @@ -16,7 +16,7 @@ class ArtworkForm < ::SingleValueForm # Add overrides for required properties which are becoming single-valued self.single_value_fields = [:title, :license] - self.admin_only_terms = [:admin_note, :dcmi_type, :doi] + self.admin_only_terms = [:admin_note, :dcmi_type, :doi, :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Image'], rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/' } diff --git a/app/forms/hyrax/data_set_form.rb b/app/forms/hyrax/data_set_form.rb index a6dc4cf9e..775dafc4a 100644 --- a/app/forms/hyrax/data_set_form.rb +++ b/app/forms/hyrax/data_set_form.rb @@ -17,7 +17,8 @@ class DataSetForm < ::SingleValueForm self.single_value_fields = [:title, :license] - self.admin_only_terms = [:dcmi_type, :admin_note, :doi, :extent, :rights_holder, :rights_statement, :copyright_date] + self.admin_only_terms = [:dcmi_type, :admin_note, :doi, :extent, :rights_holder, :rights_statement, :copyright_date, + :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Dataset'], rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/', language: ['http://id.loc.gov/vocabulary/iso639-2/eng'] } diff --git a/app/forms/hyrax/dissertation_form.rb b/app/forms/hyrax/dissertation_form.rb index 43914922e..752e997ff 100755 --- a/app/forms/hyrax/dissertation_form.rb +++ b/app/forms/hyrax/dissertation_form.rb @@ -14,7 +14,7 @@ class DissertationForm < ::SingleValueForm self.required_fields = [:title, :creator, :date_issued] self.single_value_fields = [:title, :license] - self.admin_only_terms = [:dcmi_type, :admin_note, :degree_granting_institution, :doi] + self.admin_only_terms = [:dcmi_type, :admin_note, :degree_granting_institution, :doi, :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Text'], language: ['http://id.loc.gov/vocabulary/iso639-2/eng'] } diff --git a/app/forms/hyrax/general_form.rb b/app/forms/hyrax/general_form.rb index 6348d99be..40868ed59 100644 --- a/app/forms/hyrax/general_form.rb +++ b/app/forms/hyrax/general_form.rb @@ -22,7 +22,7 @@ class GeneralForm < ::SingleValueForm self.single_value_fields = [:title, :license] - self.admin_only_terms = [:dcmi_type, :admin_note, :degree_granting_institution, :digital_collection, :doi] + self.admin_only_terms = [:dcmi_type, :admin_note, :degree_granting_institution, :digital_collection, :doi, :access_right, :rights_notes] self.default_term_values = { language: ['http://id.loc.gov/vocabulary/iso639-2/eng'] } diff --git a/app/forms/hyrax/honors_thesis_form.rb b/app/forms/hyrax/honors_thesis_form.rb index 2487e370f..a0e312a7b 100644 --- a/app/forms/hyrax/honors_thesis_form.rb +++ b/app/forms/hyrax/honors_thesis_form.rb @@ -19,7 +19,7 @@ class HonorsThesisForm < ::SingleValueForm self.single_value_fields = [:title, :license] self.admin_only_terms = [:dcmi_type, :academic_concentration, :admin_note, :award, - :degree_granting_institution, :doi, :extent] + :degree_granting_institution, :doi, :extent, :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Text'], rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/', diff --git a/app/forms/hyrax/journal_form.rb b/app/forms/hyrax/journal_form.rb index 93548c6d5..80126db80 100644 --- a/app/forms/hyrax/journal_form.rb +++ b/app/forms/hyrax/journal_form.rb @@ -16,7 +16,7 @@ class JournalForm < ::SingleValueForm self.single_value_fields = [:title, :license] - self.admin_only_terms = [:dcmi_type, :admin_note, :alternative_title, :digital_collection, :doi] + self.admin_only_terms = [:dcmi_type, :admin_note, :alternative_title, :digital_collection, :doi, :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Text'], language: ['http://id.loc.gov/vocabulary/iso639-2/eng'], rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/' } diff --git a/app/forms/hyrax/masters_paper_form.rb b/app/forms/hyrax/masters_paper_form.rb index 57e2ef347..deae97969 100755 --- a/app/forms/hyrax/masters_paper_form.rb +++ b/app/forms/hyrax/masters_paper_form.rb @@ -17,7 +17,7 @@ class MastersPaperForm < ::SingleValueForm self.single_value_fields = [:title, :license] - self.admin_only_terms = [:dcmi_type, :admin_note, :degree_granting_institution, :doi, :extent] + self.admin_only_terms = [:dcmi_type, :admin_note, :degree_granting_institution, :doi, :extent, :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Text'], rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/', language: ['http://id.loc.gov/vocabulary/iso639-2/eng'] } diff --git a/app/forms/hyrax/multimed_form.rb b/app/forms/hyrax/multimed_form.rb index a0449e282..a7f82e8cd 100644 --- a/app/forms/hyrax/multimed_form.rb +++ b/app/forms/hyrax/multimed_form.rb @@ -15,7 +15,7 @@ class MultimedForm < ::SingleValueForm self.single_value_fields = [:title, :license] - self.admin_only_terms = [:dcmi_type, :admin_note, :digital_collection, :doi, :medium] + self.admin_only_terms = [:dcmi_type, :admin_note, :digital_collection, :doi, :medium, :access_right, :rights_notes] self.default_term_values = { rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/', language: ['http://id.loc.gov/vocabulary/iso639-2/eng'] } diff --git a/app/forms/hyrax/scholarly_work_form.rb b/app/forms/hyrax/scholarly_work_form.rb index 475b19c60..e706421a2 100644 --- a/app/forms/hyrax/scholarly_work_form.rb +++ b/app/forms/hyrax/scholarly_work_form.rb @@ -16,7 +16,7 @@ class ScholarlyWorkForm < ::SingleValueForm self.single_value_fields = [:title, :license] - self.admin_only_terms = [:dcmi_type, :admin_note, :description, :digital_collection, :doi] + self.admin_only_terms = [:dcmi_type, :admin_note, :description, :digital_collection, :doi, :access_right, :rights_notes] self.default_term_values = { dcmi_type: ['http://purl.org/dc/dcmitype/Text'], rights_statement: 'http://rightsstatements.org/vocab/InC/1.0/', diff --git a/spec/forms/hyrax/article_form_spec.rb b/spec/forms/hyrax/article_form_spec.rb index 9cc46e7c7..cecea824b 100755 --- a/spec/forms/hyrax/article_form_spec.rb +++ b/spec/forms/hyrax/article_form_spec.rb @@ -40,7 +40,7 @@ it { is_expected.to match_array [:dcmi_type, :bibliographic_citation, :copyright_date, :date_captured, :date_other, :digital_collection, :doi, :extent, :rights_holder, - :translator, :identifier, :admin_note] + :translator, :identifier, :admin_note, :access_right, :rights_notes] } end diff --git a/spec/forms/hyrax/artwork_form_spec.rb b/spec/forms/hyrax/artwork_form_spec.rb index 2425573e1..f1ded959f 100644 --- a/spec/forms/hyrax/artwork_form_spec.rb +++ b/spec/forms/hyrax/artwork_form_spec.rb @@ -32,7 +32,7 @@ describe '#admin_only_terms' do subject { form.admin_only_terms } - it { is_expected.to match_array [:admin_note, :dcmi_type, :doi] } + it { is_expected.to match_array [:admin_note, :dcmi_type, :doi, :access_right, :rights_notes] } end describe 'default value set' do diff --git a/spec/forms/hyrax/data_set_form_spec.rb b/spec/forms/hyrax/data_set_form_spec.rb index c96522dec..a880b78a8 100644 --- a/spec/forms/hyrax/data_set_form_spec.rb +++ b/spec/forms/hyrax/data_set_form_spec.rb @@ -36,7 +36,7 @@ it { is_expected.to match_array [:dcmi_type, :doi, :extent, :rights_holder, :rights_statement, - :copyright_date, :admin_note] + :copyright_date, :admin_note, :access_right, :rights_notes] } end diff --git a/spec/forms/hyrax/dissertation_form_spec.rb b/spec/forms/hyrax/dissertation_form_spec.rb index db6753045..87f286b66 100755 --- a/spec/forms/hyrax/dissertation_form_spec.rb +++ b/spec/forms/hyrax/dissertation_form_spec.rb @@ -35,7 +35,7 @@ describe '#admin_only_terms' do subject { form.admin_only_terms } - it { is_expected.to match_array [:dcmi_type, :doi, :degree_granting_institution, :admin_note] } + it { is_expected.to match_array [:dcmi_type, :doi, :degree_granting_institution, :admin_note, :access_right, :rights_notes] } end describe 'default value set' do diff --git a/spec/forms/hyrax/general_form_spec.rb b/spec/forms/hyrax/general_form_spec.rb index 9448a5529..a94013bff 100644 --- a/spec/forms/hyrax/general_form_spec.rb +++ b/spec/forms/hyrax/general_form_spec.rb @@ -44,7 +44,7 @@ it { is_expected.to match_array [:dcmi_type, :degree_granting_institution, :digital_collection, :doi, - :admin_note] + :admin_note, :access_right, :rights_notes] } end diff --git a/spec/forms/hyrax/honors_thesis_form_spec.rb b/spec/forms/hyrax/honors_thesis_form_spec.rb index f6a2a110c..a75316994 100644 --- a/spec/forms/hyrax/honors_thesis_form_spec.rb +++ b/spec/forms/hyrax/honors_thesis_form_spec.rb @@ -44,7 +44,7 @@ it { is_expected.to match_array [:dcmi_type, :academic_concentration, :award, - :degree_granting_institution, :doi, :extent, :admin_note] + :degree_granting_institution, :doi, :extent, :admin_note, :access_right, :rights_notes] } end diff --git a/spec/forms/hyrax/journal_form_spec.rb b/spec/forms/hyrax/journal_form_spec.rb index fe591ea4c..9e3209bbc 100644 --- a/spec/forms/hyrax/journal_form_spec.rb +++ b/spec/forms/hyrax/journal_form_spec.rb @@ -37,7 +37,7 @@ it { is_expected.to match_array [:dcmi_type, :alternative_title, :digital_collection, :doi, - :admin_note] + :admin_note, :access_right, :rights_notes] } end diff --git a/spec/forms/hyrax/masters_paper_form_spec.rb b/spec/forms/hyrax/masters_paper_form_spec.rb index 993f54fd5..84b14df60 100755 --- a/spec/forms/hyrax/masters_paper_form_spec.rb +++ b/spec/forms/hyrax/masters_paper_form_spec.rb @@ -42,7 +42,7 @@ it { is_expected.to match_array [:dcmi_type, :degree_granting_institution, :doi, :extent, - :admin_note] + :admin_note, :access_right, :rights_notes] } end diff --git a/spec/forms/hyrax/multimed_form_spec.rb b/spec/forms/hyrax/multimed_form_spec.rb index 2a4f1e953..da56415df 100644 --- a/spec/forms/hyrax/multimed_form_spec.rb +++ b/spec/forms/hyrax/multimed_form_spec.rb @@ -33,7 +33,7 @@ describe '#admin_only_terms' do subject { form.admin_only_terms } - it { is_expected.to match_array [:dcmi_type, :digital_collection, :doi, :medium, :admin_note] } + it { is_expected.to match_array [:dcmi_type, :digital_collection, :doi, :medium, :admin_note, :access_right, :rights_notes] } end describe 'default value set' do diff --git a/spec/forms/hyrax/scholarly_work_form_spec.rb b/spec/forms/hyrax/scholarly_work_form_spec.rb index e4d779551..76681208d 100644 --- a/spec/forms/hyrax/scholarly_work_form_spec.rb +++ b/spec/forms/hyrax/scholarly_work_form_spec.rb @@ -36,7 +36,7 @@ it { is_expected.to match_array [:dcmi_type, :description, :digital_collection, :doi, - :admin_note] + :admin_note, :access_right, :rights_notes] } end