- Fix issue with partials used within haml partials

- Show all subtypes and types on most papers, and correct some formatting issues

app/models/content_object.rb

@@ -507,6 +507,7 @@ def self.content_object_class(type_id, subtype_ids)
       elsif subtype_ids&.include?(528127)
         'PaperOrderedToBePrinted'
       elsif subtype_ids&.include?(528129)
+        # Paper submitted has its own object view but uses the papers laid results view
         'PaperSubmitted'
       elsif subtype_ids&.include?(51288)
         # changed from ParliamentaryPaperLaid when object added

app/models/deposited_paper.rb

@@ -28,12 +28,10 @@ def deposited_file
     uris = get_all_from('depositedFile_uri')
     return if uris.blank?
 
-    https_uris = uris.map do |uri|
+    uris.map do |uri|
       full = URI.parse(uri[:value])
       URI::HTTPS.build(host: full.host, path: full.path)
     end
-
-    https_uris
   end
 
   def authors

app/views/search/results/_command_paper.html.erb

@@ -21,7 +21,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtype, type: object.type %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

app/views/search/results/_deposited_paper.html.erb

@@ -25,7 +25,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtype, type: object.type %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

app/views/search/results/_house_of_commons_paper.html.erb

@@ -21,7 +21,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtype, type: object.type %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

app/views/search/results/_paper_ordered_to_be_printed.html.erb

@@ -21,7 +21,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/type', type: object.object_name %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

app/views/search/results/_parliamentary_committee.erb

@@ -17,7 +17,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/type', type: object.object_name %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

app/views/search/results/_parliamentary_paper_laid.html.erb

@@ -21,7 +21,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/type', type: object.object_name %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

app/views/search/results/_unprinted_command_paper.html.erb

@@ -21,7 +21,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtype, type: object.type %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

app/views/search/results/_unprinted_paper.html.erb

@@ -28,7 +28,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="type">
-        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtype, type: object.type %>
+        <%= render 'search/results/item_details/subtype_and_type', subtype: object.subtypes, type: object.type %>
       </div>
       <div class="centre" id="status">
 

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

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

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

@@ -1,12 +1,11 @@
 - unless subtype.blank?
   - if subtype.is_a?(Array)
-    - render 'search/fragments/simple_list', items: subtype, separator: ',', terminator: ',', singular: false
+    = render 'search/fragments/simple_list', items: subtype, separator: ',', terminator: ',', singular: false
   - else
     %span.item-details>= object_display_name(subtype, singular: true)
-- unless type.blank?
-  - unless subtype.blank?
     %span>= ", "
+- unless type.blank?
   - if type.is_a?(Array)
-    - render 'search/fragments/simple_list', items: type, separator: ',', terminator: ',', singular: false
+    = render 'search/fragments/simple_list', items: type, separator: ',', terminator: ',', singular: false
   - else
     %span.item-details= object_display_name(type, singular: true)

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

@@ -1,10 +1,10 @@
 - unless subtype.blank?
   - if subtype.is_a?(Array)
-    - render 'search/fragments/simple_list', items: subtype, separator: ',', terminator: ',', singular: false
+    = render 'search/fragments/simple_list', items: subtype, separator: ',', terminator: ',', singular: false
   - else
     %span.item-details>= object_display_name(subtype, singular: true)
 - if subtype.blank?
   - if type.is_a?(Array)
-    - render 'search/fragments/simple_list', items: type, separator: ',', terminator: ',', singular: false
+    = render 'search/fragments/simple_list', items: type, separator: ',', terminator: ',', singular: false
   - else
     %span.item-details= object_display_name(type, singular: true)