diff --git a/app/views/acquired_media_releases/_acquired_media_release.html.erb b/app/views/acquired_media_releases/_acquired_media_release.html.erb index 2ebcc67..ab0f400 100644 --- a/app/views/acquired_media_releases/_acquired_media_release.html.erb +++ b/app/views/acquired_media_releases/_acquired_media_release.html.erb @@ -18,6 +18,9 @@ <%= fa_icon("warning", text: t(".no_media"), class: "text-danger") %> <% end %> + + <%= contact_info_for(acquired_media_release.contact_person) %> + <%= notes_preview acquired_media_release.notes.order_by_recent %> diff --git a/app/views/acquired_media_releases/index.html.erb b/app/views/acquired_media_releases/index.html.erb index 3bbc09c..38c41dd 100644 --- a/app/views/acquired_media_releases/index.html.erb +++ b/app/views/acquired_media_releases/index.html.erb @@ -29,6 +29,7 @@ <%= t '.table_headers.approved'%> <%= AcquiredMediaRelease.human_attribute_name(:name) %> <%= t(".table_headers.file_infos_count") %> + <%= t(".table_headers.owner_info") %> <%= t(".table_headers.notes") %> <%= t(".table_headers.tags") %> <%= t(".table_headers.signed_at") %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 81afc75..88ac5c4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -67,6 +67,7 @@ en: notes: Notes signed_at: Date Signed tags: Tags + owner_info: Owner Info new: heading: Import Acquired Media Release update: diff --git a/config/locales/es.yml b/config/locales/es.yml index 157f51f..b17bf1e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -21,6 +21,7 @@ es: notes: Notes (ES) signed_at: Date Signed (ES) tags: Tags (ES) + owner_info: Owner Info (ES) activerecord: attributes: appearance_release: diff --git a/spec/factories/acquired_media_releases.rb b/spec/factories/acquired_media_releases.rb index 952f049..b45c57e 100644 --- a/spec/factories/acquired_media_releases.rb +++ b/spec/factories/acquired_media_releases.rb @@ -4,6 +4,22 @@ FactoryBot.define do name "Test Acquired Media Release" + trait :with_address do + person_address_street1 "St1" + person_address_street2 "St2" + person_address_city "City" + person_address_state "State" + person_address_zip "123" + person_address_country "US" + end + + trait :with_owner_info do + person_first_name "Jane" + person_last_name "Doe" + person_phone "100-555-1001" + person_email "owner@email.com" + end + trait :native do signature do path = Rails.root.join("spec", "fixtures", "files", "signature.png") diff --git a/spec/features/user_managing_acquired_media_releases_spec.rb b/spec/features/user_managing_acquired_media_releases_spec.rb index 61ac8c8..e40554d 100644 --- a/spec/features/user_managing_acquired_media_releases_spec.rb +++ b/spec/features/user_managing_acquired_media_releases_spec.rb @@ -165,6 +165,24 @@ feature "User managing acquired_media releases" do sign_in current_user end + scenario "index table shows owner info" do + release = create(:acquired_media_release, :with_owner_info, :with_address, project: project) + + visit project_acquired_media_releases_path(project) + + expect(page).to have_content owner_info_table_header + + expect(page).to have_content release.person_first_name + expect(page).to have_content release.person_last_name + expect(page).to have_content release.person_phone + expect(page).to have_content release.person_email + expect(page).to have_content release.person_address_street1 + expect(page).to have_content release.person_address_city + expect(page).to have_content release.person_address_state + expect(page).to have_content release.person_address_zip + expect(page).to have_content release.person_address_country + end + scenario "creating a release for an adult", js: true do visit new_project_acquired_media_release_path(project) @@ -836,4 +854,8 @@ feature "User managing acquired_media releases" do def successful_import_message t 'acquired_media_releases.create.notice' end + + def owner_info_table_header + t 'acquired_media_releases.index.table_headers.owner_info' + end end