AR-1484 make agent description an array if there are more than one note

archivesspace · Jun 19, 2017 · 0484bdc · 0484bdc
1 parent b8480ed
commit 0484bdc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/public-new/app/models/agent_corporate_entity.rb b/public-new/app/models/agent_corporate_entity.rb
@@ -15,11 +15,10 @@ def metadata
       md['dissolutionDate'] = dates['end'] if dates['end']
     end
 
-    md['description'] = if (note = json['notes'].select{|n| n['jsonmodel_type'] == 'note_bioghist'}.first)
+    md['description'] = json['notes'].select{|n| n['jsonmodel_type'] == 'note_bioghist'}.map{|note|
                           strip_mixed_content(note['subnotes'].map{|s| s['content']}.join(' '))
-                        else
-                          ''
-                        end
+                        }
+    md['description'] = md['description'][0] if md['description'].length == 1
 
     md
   end

diff --git a/public-new/app/models/agent_family.rb b/public-new/app/models/agent_family.rb
@@ -15,11 +15,10 @@ def metadata
       md['dissolutionDate'] = dates['end'] if dates['end']
     end
 
-    md['description'] = if (note = json['notes'].select{|n| n['jsonmodel_type'] == 'note_bioghist'}.first)
+    md['description'] = json['notes'].select{|n| n['jsonmodel_type'] == 'note_bioghist'}.map{|note|
                           strip_mixed_content(note['subnotes'].map{|s| s['content']}.join(' '))
-                        else
-                          ''
-                        end
+                        }
+    md['description'] = md['description'][0] if md['description'].length == 1
 
     md
   end

diff --git a/public-new/app/models/agent_person.rb b/public-new/app/models/agent_person.rb
@@ -15,11 +15,10 @@ def metadata
       md['deathDate'] = dates['end'] if dates['end']
     end
 
-    md['description'] = if (note = json['notes'].select{|n| n['jsonmodel_type'] == 'note_bioghist'}.first)
+    md['description'] = json['notes'].select{|n| n['jsonmodel_type'] == 'note_bioghist'}.map{|note|
                           strip_mixed_content(note['subnotes'].map{|s| s['content']}.join(' '))
-                        else
-                          ''
-                        end
+                        }
+    md['description'] = md['description'][0] if md['description'].length == 1
 
     md['knows'] = json['related_agents'].select{|ra|
       ra['relator'] == ra['is_associative_with'] && ra['_resolved']['jsonmodel_type'] == json['jsonmodel_type']}.map do |ag|