AR-1780 show terms in subject list for any agents with a subject role…

… and terms
archivesspace · Jun 19, 2017 · 45c76d0 · 45c76d0
1 parent ccc3513
commit 45c76d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/public-new/app/models/record.rb b/public-new/app/models/record.rb
@@ -260,8 +260,11 @@ def parse_agents(subjects_arr)
       unless agent['role'].blank? || agent['_resolved'].blank?
         role = agent['role']
         ag = title_and_uri(agent['_resolved'], agent['_inherited'])
-        if role == 'subject'
-          subjects_arr.push(ag) if ag
+        if role == 'subject' && ag
+          unless (terms = ASUtils.wrap(agent.dig('terms'))).empty?
+            ag['title'] += " &#8212; #{terms.collect{|t| t['term']}.join(' -- ')}"
+          end
+          subjects_arr.push(ag)
         elsif ag
           agents_h[role] = agents_h[role].blank? ? [ag] : agents_h[role].push(ag)
         end

diff --git a/public-new/app/views/shared/_present_list.html.erb b/public-new/app/views/shared/_present_list.html.erb
@@ -26,7 +26,7 @@
         <% unless item['uri'].blank? %>
          <a href="<%= item['uri'] %>">
         <% end %>
-        <%= item['title'] %>
+        <%= item['title'].html_safe %>
         <% unless item['uri'].blank? %>
          </a>
         <% end %>