NOP-68 - Move "Rights.rightsHolderContact" to services_contact (#972)

* NOP-68 - Move "Rights.rightsHolderContact" to services_contact * spec fixes * Update catalog_controller.rb --------- Co-authored-by: Andy Wallace <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
UCLALibrary · Feb 14, 2025 · 39c8afa · 39c8afa
1 parent 745b5c5
commit 39c8afa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
@@ -214,6 +214,7 @@ def self.modified_field
     config.add_show_field 'inscription_tesim'
     config.add_show_field 'librettist_tesim'
     config.add_show_field 'script_tesim'
+    config.add_show_field 'services_contact_ssm'
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields

diff --git a/app/importers/californica_mapper.rb b/app/importers/californica_mapper.rb
@@ -114,14 +114,13 @@ class CalifornicaMapper < Darlingtonia::HashMapper
     resp_statement: "Statement of Responsibility",
     rights_country: "Rights.countryCreation",
     rights_holder: ["Personal or Corporate Name.copyrightHolder",
-                    "Rights.rightsHolderContact",
                     "Rights.rightsHolderName"],
     rights_statement: "Rights.copyrightStatus",
     rubricator: ["Rubricator", "Name.rubricator"],
     scribe: "Name.scribe",
     script: "Script",
     series: "Series",
-    services_contact: "Rights.servicesContact",
+    services_contact: ["Rights.servicesContact", "Rights.rightsHolderContact"],
     subject: "Subject",
     subject_geographic: ["Subject geographic", "Subject place"],
     subject_cultural_object: "Subject.culturalObject",

diff --git a/app/presenters/hyrax/work_presenter.rb b/app/presenters/hyrax/work_presenter.rb
@@ -94,6 +94,7 @@ class WorkPresenter < Hyrax::WorkShowPresenter
       :scribe,
       :script,
       :series,
+      :services_contact,
       :subject_cultural_object,
       :subject_domain_topic,
       :subject_geographic,

diff --git a/app/views/hyrax/base/_attribute_rows.html.erb b/app/views/hyrax/base/_attribute_rows.html.erb
@@ -111,6 +111,7 @@
 <%= presenter.attribute_to_html(:scribe, html_dl: true) %>
 <%= presenter.attribute_to_html(:script, html_dl: true) %>
 <%= presenter.attribute_to_html(:series, render_as: :faceted, html_dl: true) %>
+<%= presenter.attribute_to_html(:services_contact, html_dl: true) %>
 <%= presenter.attribute_to_html(:source, html_dl: true) %>
 <%= presenter.attribute_to_html(:subject, render_as: :faceted, html_dl: true) %>
 <%= presenter.attribute_to_html(:subject_cultural_object, render_as: :faceted, html_dl: true) %>

diff --git a/spec/system/import_and_show_work_spec.rb b/spec/system/import_and_show_work_spec.rb
@@ -51,7 +51,7 @@
     expect(page).to have_content "University of California, Los Angeles. Library. Department of Special Collections" # repository
     expect(page).to have_content "Los Angeles Daily News" # publisher
     expect(page).to have_content "US" # rights_country
-    expect(page).to have_content "UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: [email protected]. Phone: (310)825-4988" # rights_holder
+    expect(page).to have_content "UCLA Charles E. Young Research Library Department of Special Collections, A1713 Young Research Library, Box 951575, Los Angeles, CA 90095-1575. E-mail: [email protected]. Phone: (310)825-4988" # services_contact
     expect(page).to have_content "1942/1952" # normalized_date
     expect(page).to have_content "uclamss_1387_b112_40911-1" # local_identifier
     expect(page).to have_content "[between 1942-1947]" # date_created