Merge branch 'display_depositor_on_work_show_page' into 'develop'

Display depositor and proxy depositor on work show page.

See merge request FDM/rdm-system/rdms!208

hyrax/app/presenters/hyrax/crc_dataset_presenter.rb

@@ -4,7 +4,7 @@ module Hyrax
   class CrcDatasetPresenter < Hyrax::WorkShowPresenter
     delegate :approval_number, :complex_date, :complex_funding_reference, :complex_identifier, :complex_person,
              :complex_relation, :complex_subject, :coverage, :crc_resource_type, :crc_work_type, :doi, :folder_name,
-             :experiment_description, :extra_information, :modality, :parent_work_id, :software_version, :tombstone_status, :tombstone_date, :is_tombstoned, to: :solr_document
+             :experiment_description, :extra_information, :modality, :parent_work_id, :software_version, :tombstone_status, :tombstone_date, :is_tombstoned, :proxy_depositor, to: :solr_document
 
     def list_all_children(options = {})
       all_children = {

hyrax/app/presenters/hyrax/dataset_presenter.rb

@@ -4,6 +4,6 @@ module Hyrax
   class DatasetPresenter < Hyrax::WorkShowPresenter
     delegate :complex_person, :complex_date, :complex_relation, :software_version, :dataset_method, :series_information,
              :table_of_contents, :technical_information, :based_near_label, :complex_funding_reference,  :complex_identifier, :doi,
-             :tombstone_status, :tombstone_date, :is_tombstoned, to: :solr_document
+             :tombstone_status, :tombstone_date, :is_tombstoned, :proxy_depositor, to: :solr_document
   end
 end

hyrax/app/views/hyrax/crc_datasets/_attribute_rows.html.erb

@@ -12,6 +12,10 @@
     <!-- Accordion body -->
     <div id="metadata" class="panel-collapse collapse">
       <div class="panel-body">
+        <% if current_user %>
+          <%= presenter.attribute_to_html(:depositor, render_as: :faceted, label: t('rdms.fields.depositor'), html_dl: true) %>
+          <%= presenter.attribute_to_html(:proxy_depositor, render_as: :faceted, label: t('rdms.fields.proxy_depositor'), html_dl: true) %>
+        <% end %>
         <%= presenter.attribute_to_html(:complex_person, render_as: :nested_person, label: t('rdms.fields.complex_person'), html_dl: true) %>
         <%= presenter.attribute_to_html(:coverage, label: t('rdms.fields.coverage'), render_as: :faceted, html_dl: true) %>
         <%= presenter.attribute_to_html(:crc_resource_type, label: t('rdms.fields.crc_resource_type'), render_as: :faceted, html_dl: true) %>

hyrax/app/views/hyrax/datasets/_attribute_rows.html.erb

@@ -14,6 +14,10 @@
       <div class="panel-body">
         <!-- required terms -->
         <%= presenter.attribute_to_html(:title, label: t('Title'), html_dl: true) %>
+        <% if current_user %>
+          <%= presenter.attribute_to_html(:depositor, render_as: :faceted, label: t('rdms.fields.depositor'), html_dl: true) %>
+          <%= presenter.attribute_to_html(:proxy_depositor, render_as: :faceted, label: t('rdms.fields.proxy_depositor'), html_dl: true) %>
+        <% end %>
         <%= presenter.attribute_to_html(:complex_person, render_as: :nested_person, label: t('rdms.fields.complex_person'), html_dl: true) %>
         <%= presenter.attribute_to_html(:abstract, html_dl: true) %>
         <%= presenter.attribute_to_html(:resource_type, render_as: :faceted, html_dl: true) %>

hyrax/config/locales/en.yml

@@ -32,6 +32,8 @@
 en:
   rdms:
     fields:
+      depositor:                "Owner"
+      proxy_depositor:          "Depositor"
       alternative_title:        "Alternative title"
       approval_number:          "Animal/Ethics Approval No."
       complex_date:             "Date"