- Changes to asking / tabling / answering member parties shown in sea…

…rch results

- Fixes to several other search result partials involving multiple names

app/models/content_object.rb

@@ -303,6 +303,10 @@ def asking_member_party
     get_first_from('askingMemberParty_ses')
   end
 
+  def asking_member_parties
+    get_all_from('askingMemberParty_ses')
+  end
+
   def lead_member
     get_first_from('leadMember_ses')
   end

app/models/question.rb

@@ -72,6 +72,10 @@ def tabling_member_party
     get_first_from('tablingMemberParty_ses')
   end
 
+  def tabling_member_parties
+    get_all_from('tablingMemberParty_ses')
+  end
+
   def answer_text
     get_first_as_html_from('answerText_t')
   end
@@ -100,6 +104,10 @@ def answering_member_party
     get_first_from('answeringMemberParty_ses')
   end
 
+  def answering_member_parties
+    get_all_from('answeringMemberParty_ses')
+  end
+
   def question?
     true
   end

app/views/search/fragments/_simple_list.haml

@@ -4,7 +4,7 @@
     %span>= terminator
   - elsif items.size == 2
     %span= object_display_name(items.first, singular: singular)
-    %span= "; "
+    %span>= "; "
     %span= object_display_name(items.last, singular: singular)
     %span>= terminator
   - elsif items.size > 2

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

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/lead_member', lead_member: object.lead_member, lead_member_party: object.lead_member_party %>
+        <%= render 'search/results/item_details/lead_members', lead_members: object.lead_member, label: 'Lead Member' %>
       </div>
       <div class="centre" id="secondary-person">
       </div>

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

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/lead_member', lead_member: object.lead_member, lead_member_party: object.lead_member_party %>
+        <%= render 'search/results/item_details/lead_members', lead_members: object.lead_members, label: 'Lead Member' %>
       </div>
       <div class="centre" id="secondary-person">
         <%= render 'search/results/item_details/answering_members', answering_members: object.answering_members, label: 'Answering Member' %>

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

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_party %>
+        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_parties %>
       </div>
       <div class="centre" id="secondary-person">
       </div>

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

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/lead_member', lead_member: object.lead_member, lead_member_party: object.lead_member_party %>
+        <%= render 'search/results/item_details/lead_members', lead_members: object.lead_members, label: 'Lead Member' %>
       </div>
       <div class="centre" id="secondary-person">
       </div>

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

@@ -13,11 +13,11 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/asking_or_tabling_member', asking_member: object.asking_member, tabling_member: object.tabling_member, asking_member_party: object.asking_member_party, tabling_member_party: object.tabling_member_party, label: 'Asked by' %>
+        <%= render 'search/results/item_details/asking_or_tabling_member', asking_member: object.asking_member, tabling_member: object.tabling_member, asking_member_party: object.asking_member_parties, tabling_member_party: object.tabling_member_parties, label: 'Asked by' %>
       </div>
       <div class="centre" id="secondary-person">
         <div <%= 'hidden' unless params[:show_detailed] == "true" %> class="item-details" data-detailed-results-target="toggleHidden">
-          <%= render 'search/results/item_details/answering_member', answering_member: object.answering_member, answering_member_party: object.answering_member_party, label: 'Answered by' %>
+          <%= render 'search/results/item_details/answering_member', answering_member: object.answering_member, answering_member_party: object.answering_member_parties, label: 'Answered by' %>
         </div>
       </div>
       <div class="right" id="primary-group">

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

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_party %>
+        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_parties %>
       </div>
       <div class="centre" id="secondary-person">
       </div>

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

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_party %>
+        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_parties %>
       </div>
       <div class="centre" id="secondary-person">
       </div>

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

@@ -13,7 +13,7 @@
   <div class="row">
     <div class="three-panel">
       <div class="left" id="primary-person">
-        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_party %>
+        <%= render 'search/results/item_details/member', member: object.member, member_party: object.member_parties %>
       </div>
       <div class="centre" id="secondary-person">
       </div>

app/views/search/results/item_details/_answering_member.html.erb

@@ -9,9 +9,7 @@
       <%= object_display_name(answering_member, singular: false) %>
     </span>
     <% unless answering_member_party.blank? %>
-      <span>
-        (<%= object_display_name(answering_member_party, singular: false) %>)
-      </span>
+      (<%= render 'search/fragments/simple_list', items: answering_member_party, terminator: "", singular: false %>)
     <% end %>
   </div>
 <% end %>

app/views/search/results/item_details/_asking_or_tabling_member.html.erb

@@ -8,18 +8,14 @@
       <%= object_display_name(tabling_member, singular: false) %>
       </span>
       <% unless tabling_member_party.blank? %>
-        <span>
-          (<%= object_display_name(tabling_member_party, singular: false) %>)
-        </span>
+        (<%= render 'search/fragments/simple_list', items: tabling_member_party, terminator: "", singular: false %>)
       <% end %>
     <% else %>
       <span>
       <%= object_display_name(asking_member, singular: false) %>
       </span>
       <% unless asking_member_party.blank? %>
-      <span>
-        (<%= object_display_name(asking_member_party, singular: false) %>)
-      </span>
+        (<%= render 'search/fragments/simple_list', items: asking_member_party, terminator: "", singular: false %>)
       <% end %>
     <% end %>
   </div>