From 31b745e972c684f10e78af0ac8e5f48df1e6cfbf Mon Sep 17 00:00:00 2001
From: Marcelo Paiva <mpaiva@gmail.com>
Date: Wed, 25 Feb 2026 22:51:38 -0500
Subject: [PATCH] Fix BetterHtml::DontInterpolateHere in turbo modal partials

Replace raw String interpolation of aria-labelledby attribute with
inline quoted attribute interpolation, which BetterHtml permits.
Always render the attribute since the ID is always generated; a
reference to a non-existent element is harmless when no title is set.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/views/shared/_turbo_modal.html.erb       | 2 +-
 app/views/shared/_turbo_modal_large.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_turbo_modal.html.erb b/app/views/shared/_turbo_modal.html.erb
index e2bdfaa9..553f665f 100644
--- a/app/views/shared/_turbo_modal.html.erb
+++ b/app/views/shared/_turbo_modal.html.erb
@@ -1,6 +1,6 @@
 <turbo-frame id="modal">
   <% modal_title_id = "modal_title_#{SecureRandom.hex(4)}" %>
-  <turbo-modal class="modal modal-open items-start !animate-none overflow-y-auto" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>" <%= "aria-labelledby=\"#{modal_title_id}\"" if local_assigns[:title] %>>
+  <turbo-modal class="modal modal-open items-start !animate-none overflow-y-auto" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>" aria-labelledby="<%= modal_title_id %>">
     <div class="absolute top-0 bottom-0 right-0 left-0" data-action="click:turbo-modal#close"></div>
     <div class="modal-box pt-4 pb-6 px-6 mt-20 max-h-none">
       <% if local_assigns[:title] %>
diff --git a/app/views/shared/_turbo_modal_large.html.erb b/app/views/shared/_turbo_modal_large.html.erb
index 75b770ec..929451d3 100644
--- a/app/views/shared/_turbo_modal_large.html.erb
+++ b/app/views/shared/_turbo_modal_large.html.erb
@@ -1,6 +1,6 @@
 <turbo-frame id="modal">
   <% modal_title_id = "modal_title_#{SecureRandom.hex(4)}" %>
-  <turbo-modal class="modal modal-open items-start !animate-none overflow-y-auto !justify-normal md:!justify-center" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>"<%= html_attributes('aria-labelledby': modal_title_id) if local_assigns[:title] %>>
+  <turbo-modal class="modal modal-open items-start !animate-none overflow-y-auto !justify-normal md:!justify-center" data-close-after-submit="<%= local_assigns.key?(:close_after_submit) ? local_assigns[:close_after_submit] : true %>" aria-labelledby="<%= modal_title_id %>">
     <div class="absolute top-0 bottom-0 right-0 left-0" data-action="click:turbo-modal#close"></div>
     <div class="bg-base-100 min-h-screen max-h-screen md:min-h-fit md:mt-3 md:rounded-2xl relative w-full relative overflow-y-auto">
       <% if local_assigns[:title] %>