move submission notes out of metadata

pulibrary · Jan 5, 2023 · 2ec0ea1 · 2ec0ea1
1 parent 437fbf7
commit 2ec0ea1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/app/views/works/_work_activity_history.html.erb b/app/views/works/_work_activity_history.html.erb
@@ -1,14 +1,23 @@
 <div>
   <h2>Messages</h2>
-  <% if @comments.size == 0 %>
+  <% if @comments.size == 0 && !@work.submission_notes.present? %>
     No messages
   <% end %>
+
   <% @comments.each do |activity| %>
     <%= render partial: 'work_activity', locals: {
       activity: activity,
       event_type: activity.event_type
     } %>
   <% end %>
+  <% if @work.submission_notes.present? %>
+    <div class="activity-history-item activity-history-comment-item">
+      <div class="activity-history-comment-title">
+        Submission message
+      </div>
+      <%= @work.submission_notes %>
+    </div>
+  <% end %>
 
   <div id="new-comment-section">
     <%= form_with url: add_comment_work_path(@work) do |f| %>

diff --git a/app/views/works/show.html.erb b/app/views/works/show.html.erb
@@ -240,11 +240,6 @@
     <dt>Location notes</dt>
     <dd><%= @work.location_notes %></dd>
   <% end %>
-
-  <% if @work.submission_notes.present? %>
-    <dt>Notes</dt>
-    <dd><%= @work.submission_notes %></dd>
-  <% end %>
 </dl>
 
 <% if @work.approved? %>