Skip to content

Commit

Permalink
Make access_right and rights_notes admin only fields
Browse files Browse the repository at this point in the history
  • Loading branch information
bbpennel committed Aug 18, 2023
1 parent 1eb7bc7 commit 5c8cb93
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion app/forms/hyrax/article_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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/' }
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/artwork_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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/' }

Expand Down
3 changes: 2 additions & 1 deletion app/forms/hyrax/data_set_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/dissertation_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }

Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/general_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }

Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/honors_thesis_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/journal_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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/' }
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/masters_paper_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/multimed_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }
Expand Down
2 changes: 1 addition & 1 deletion app/forms/hyrax/scholarly_work_form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/article_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/artwork_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/data_set_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/dissertation_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/general_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/honors_thesis_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/journal_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/masters_paper_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/multimed_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/forms/hyrax/scholarly_work_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5c8cb93

Please sign in to comment.