AR-1481 Show deaccessions inline with their accession (on the resourc…

…e) and list deaccessions on the accessions view
archivesspace · Jun 19, 2017 · fb39374 · fb39374
1 parent 166c586
commit fb39374
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 24 deletions.
diff --git a/public-new/app/models/resource.rb b/public-new/app/models/resource.rb
@@ -9,7 +9,6 @@ def initialize(*args)
     @digital_instances = parse_digital_instance
     @finding_aid = parse_finding_aid
     @related_accessions = parse_related_accessions
-    @related_deaccessions = parse_related_deaccessions
     @cite = parse_cite_string
   end
 
@@ -92,18 +91,6 @@ def parse_related_accessions
     }
   end
 
-  def parse_related_deaccessions
-    return [] unless AppConfig[:pui_display_deaccessions]
-
-    deaccessions = []
-
-    related_accessions.each{|accession|
-      deaccessions.concat(accession.deaccessions)
-    }
-
-    deaccessions
-  end
-
   def parse_cite_string
     cite = note('prefercite')
     unless cite.blank?

diff --git a/public-new/app/views/resources/_related_accessions.html.erb b/public-new/app/views/resources/_related_accessions.html.erb
@@ -6,15 +6,17 @@
         <strong><%= accession.acquisition_type %></strong>:
       <% end %>
       <%= link_to accession.display_string, accession.uri %>
+
+      <% unless accession.deaccessions.empty? %>
+        <div>
+          <h5><%= t('resource._public.related_accessions.deaccessions') %></h5>
+          <ul>
+            <% accession.deaccessions.each do |deaccession| %>
+              <li><%= deaccession['description'] %></li>
+            <% end %>
+          </ul>
+        </div>
+      <% end %>
     </li>
   <% end %>
-</ul>
-
-<% unless deaccessions.empty? %>
-  <h4><%= t('resource._public.related_accessions.deaccessions') %></h4>
-  <ul>
-    <% deaccessions.each do |deaccession| %>
-      <li><%= deaccession['description'] %></li>
-    <% end %>
-  </ul>
-<% end %>
+</ul>
diff --git a/public-new/app/views/shared/_record_innards.html.erb b/public-new/app/views/shared/_record_innards.html.erb
@@ -39,6 +39,10 @@
 	<%= render partial: 'shared/accordion_panel', locals: {:p_title =>  t('resource._public.additional'), 
 	      :p_id => 'add_desc', :p_body => x } %>
 	<% end %>
+        <% if @result.kind_of?(Accession) && !@result.deaccessions.blank? %>
+          <% x = render partial: 'shared/present_list', locals: {:list =>  @result.deaccessions.collect{|d| d.fetch('description')}, :list_clss => 'deaccessions'} %>
+          <%= render partial: 'shared/accordion_panel', locals: {:p_title => t('deaccessions'), :p_id => 'deaccessions_list', :p_body => x} %>
+        <% end %>
         <% unless @result.subjects.blank? %>
 	   <% x= render partial: 'shared/present_list', locals: {:list => @result.subjects, :list_clss => 'subjects_list'} %>
 	   <%= render partial: 'shared/accordion_panel', locals: {:p_title =>  t('subject._plural'),
@@ -74,7 +78,7 @@
 	    :p_id => 'repo_deets', :p_body => x} %>
         <% end %>
         <% if @result.kind_of?(Resource) && !@result.related_accessions.blank? %>
-          <% x = render partial: 'resources/related_accessions', locals: {:accessions => @result.related_accessions, :deaccessions => @result.related_deaccessions} %>
+          <% x = render partial: 'resources/related_accessions', locals: {:accessions => @result.related_accessions} %>
           <%= render partial: 'shared/accordion_panel', locals: {:p_title => t('related_accessions'), :p_id => 'related_accessions_list', :p_body => x} %>
         <% end %>
         <% if @result.kind_of?(Accession) && !@result.related_resources.blank? %>