From 9f9125d52dd8d44563983b1bbaa871aef55493fa Mon Sep 17 00:00:00 2001
From: fherreazcue <francisco.herreazcue@gmail.com>
Date: Thu, 7 Sep 2023 20:33:58 +0100
Subject: [PATCH] Fix bug - publish_related_items_confirm trying to access
 event.assays

---
 .../publish_related_items_confirm.html.erb    |  2 +-
 .../publishing/batch_publishing_test.rb       | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/views/assets/publishing/publish_related_items_confirm.html.erb b/app/views/assets/publishing/publish_related_items_confirm.html.erb
index 07c1a56ac9..180c2fa0ce 100644
--- a/app/views/assets/publishing/publish_related_items_confirm.html.erb
+++ b/app/views/assets/publishing/publish_related_items_confirm.html.erb
@@ -8,7 +8,7 @@
 <ul class="publishing_options">
 
   <% @items_for_publishing.each do |item| %>
-    <% if item.is_a?(Assay) || !item.assays.empty? %>
+    <% if item.is_a?(Assay) || (!item.is_a?(Event) && !item.assays.empty?) %>
       <li class="type_and_title">
         <%= text_for_resource item -%>: <%= link_to item.title, item, :target => "_blank" -%>
         <% if item.is_published? %>
diff --git a/test/functional/publishing/batch_publishing_test.rb b/test/functional/publishing/batch_publishing_test.rb
index ff98852ca9..91ce32f9ce 100644
--- a/test/functional/publishing/batch_publishing_test.rb
+++ b/test/functional/publishing/batch_publishing_test.rb
@@ -110,7 +110,6 @@ def setup
 
     get :check_gatekeeper_required, params: params.merge(id: person.id)
     assert_response :success
-    pp(params.merge(id: person.id))
 
     # Publishable shown in immediate publishing section
     assert_select 'h2', text: /The following items will be published:/, count: 1
@@ -139,6 +138,26 @@ def setup
     end
   end
 
+  test 'Events are skipped *in publish related items' do
+    person = User.current_user.person
+    assay = FactoryBot.create(:assay, contributor: person)
+    df = FactoryBot.create(:data_file, projects: [person.projects.first], assays: [assay], contributor: person)
+    event = FactoryBot.create(:event, contributor: person)
+    login_as(person.user)
+    assert df.can_publish?
+    assert event.can_publish?
+
+    params = { publish: {} }
+    [df, event].each do |asset|
+      params[:publish][asset.class.name] ||= {}
+      params[:publish][asset.class.name][asset.id.to_s] = '1'
+    end
+
+    get :check_related_items, params: params.merge(id: person.id)
+    assert_response :success
+
+  end
+
   test 'do not have not_publishable_type item in batch_publishing_preview' do
     item = FactoryBot.create(:publication,
                    contributor: User.current_user.person,