From 335e1d94dd39a29414719585c4fbed3990f6df2c Mon Sep 17 00:00:00 2001
From: maebeale <maebeale@users.noreply.github.com>
Date: Mon, 22 Jun 2026 10:55:02 -0400
Subject: [PATCH] Stop flagging a "Facilitator" form title as differing from a
 facilitator affiliation

The title-comparison badge excluded facilitator affiliations from the
match check, so a form whose position is literally "Facilitator" was
flagged as differing even when the org already had a matching facilitator
affiliation. Compare against all affiliations instead.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../event_registrations/_org_affiliation_pills.html.erb  | 3 +--
 spec/requests/event_registrations_spec.rb                | 9 +++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/event_registrations/_org_affiliation_pills.html.erb b/app/views/event_registrations/_org_affiliation_pills.html.erb
index f389a6a9a0..7158419dfb 100644
--- a/app/views/event_registrations/_org_affiliation_pills.html.erb
+++ b/app/views/event_registrations/_org_affiliation_pills.html.erb
@@ -6,7 +6,6 @@
   <% active = ->(a) { !a.inactive? && (a.end_date.nil? || a.end_date >= Date.current) } %>
   <% position = submitted_position.to_s.strip %>
   <% is_submitted_org = submitted_org_name.to_s.strip.present? && org.name.to_s.strip.casecmp?(submitted_org_name.to_s.strip) %>
-  <% role_affiliations = affiliations.reject(&:facilitator?) %>
   <div class="flex flex-wrap items-center gap-1.5 mt-1.5">
     <span class="text-[0.65rem] font-semibold uppercase tracking-wide text-gray-400">Affiliations:</span>
     <% affiliations.each do |a| %>
@@ -28,7 +27,7 @@
       <% title_attr = a.facilitator? ? "Facilitator role — determines whether the org is active with AWBW" : nil %>
       <span class="<%= badge %> <%= color %>" title="<%= title_attr %>"><%= label %></span>
     <% end %>
-    <% if is_submitted_org && position.present? && role_affiliations.none? { |a| a.title.to_s.casecmp?(position) } %>
+    <% if is_submitted_org && position.present? && affiliations.none? { |a| a.title.to_s.casecmp?(position) } %>
       <span class="<%= badge %> bg-amber-50 text-amber-700 border-amber-200" title="Form: <%= position %>">Title differs from form (form: <%= position %>)</span>
     <% end %>
   </div>
diff --git a/spec/requests/event_registrations_spec.rb b/spec/requests/event_registrations_spec.rb
index cbbf84ab23..4439e20ab5 100644
--- a/spec/requests/event_registrations_spec.rb
+++ b/spec/requests/event_registrations_spec.rb
@@ -467,6 +467,15 @@ def details_open?(body, heading)
           expect(response.body).not_to include("Title differs from form")
         end
 
+        it "does not show a title-comparison badge when a facilitator affiliation matches the submitted 'Facilitator' position" do
+          create(:affiliation, person: regular_user.person, organization: organization, title: "Facilitator")
+          submit_form(org_name: organization.name, position: "Facilitator")
+
+          get link_organization_event_registration_path(existing_registration)
+
+          expect(response.body).not_to include("Title differs from form")
+        end
+
         it "shows 'Title differs from form' when the affiliation title differs from the submitted position" do
           create(:affiliation, person: regular_user.person, organization: organization, title: "Counselor")
           submit_form(org_name: organization.name, position: "Director")