Merge pull request #196 from ukparliament/development

Development merge

app/models/content_object.rb

@@ -252,7 +252,7 @@ def notes
   end
 
   def related_item_ids
-    get_all_ids_from('relation_t')
+    combine_fields(get_all_ids_from('relation_t'), get_all_ids_from('relation_uri'))
   end
 
   def contribution_text

app/models/european_material.rb

@@ -61,7 +61,8 @@ def ec_documents
   def related_item_ids
     doc_text = get_all_ids_from('referencingDD_t')
     doc_uri = get_all_ids_from('referencingDD_uri')
-    relation_uris = get_all_ids_from('relation_t')
-    [doc_text, doc_uri, relation_uris].flatten.compact
+    relation_text_uris = get_all_ids_from('relation_t')
+    relation_uris = get_all_ids_from('relation_uri')
+    [doc_text, doc_uri, relation_text_uris, relation_uris].flatten.compact
   end
 end

app/views/search/results/item_details/_category_and_subtype_or_type.html.haml

@@ -1,29 +1,20 @@
 - unless category.blank?
+  %div.item-details
   - if category.is_a?(Array)
-    %div.item-details
-      %div.item-details-label= "Type"
-      = render 'search/fragments/simple_list', items: category, separator: ';', terminator: ';', singular: false
+    %div.item-details-label= "Type"
+    %span>= render 'search/fragments/simple_list', items: category, separator: ';', terminator: ';', singular: false
   - else
-    %div.item-details
-      %div.item-details-label= "Type"
-      = object_display_name(category, singular: true)
+    %div.item-details-label= "Type"
+    %span>= object_display_name(category, singular: true)
 - unless subtype.blank?
   - unless category.blank?
     %span>= "; "
   - if subtype.is_a?(Array)
-    %div.item-details
-      %div.item-details-label= "Type"
-      = render 'search/fragments/simple_list', items: subtype, separator: ';', terminator: ';', singular: false
+    = render 'search/fragments/simple_list', items: subtype, separator: ';', terminator: ';', singular: false
   - else
-    %div.item-details
-      %div.item-details-label= "Type"
-      = object_display_name(subtype, singular: true)
+    = object_display_name(subtype, singular: true)
 - if subtype.blank? && category.blank?
   - if type.is_a?(Array)
-    %div.item-details
-      %div.item-details-label= "Type"
-      = render 'search/fragments/simple_list', items: type, separator: ';', terminator: ';', singular: false
+    = render 'search/fragments/simple_list', items: type, separator: ';', terminator: ';', singular: false
   - else
-    %div.item-details
-      %div.item-details-label= "Type"
-      = object_display_name(type, singular: true)
+    = object_display_name(type, singular: true)

coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "line": 80.25
+    "line": 80.17
   }
 }