From 225c7b56c43f7e1f3bb74cac00a75a3c0ae08ad5 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Tue, 30 Jun 2026 14:41:41 -0400
Subject: [PATCH 1/2] fix required textarea in gbr

---
 src/main/webapp/guestbook-terms-popup-fragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/guestbook-terms-popup-fragment.xhtml b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
index a17145a43ce..14e8fb551a6 100644
--- a/src/main/webapp/guestbook-terms-popup-fragment.xhtml
+++ b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
@@ -232,7 +232,7 @@
                                 <p:inputTextarea id="customQuestionResponseTextArea" rows="8" autoResize="true"
                                              styleClass="form-control"
                                              value="#{customQuestionResponse.response}"
-                                             required="#{param['DO_GB_VALIDATION'] and customQuestionResponse.customQuestion.required}"
+                                             required="#{param[validateThisContext] and customQuestionResponse.customQuestion.required}"
                                              rendered="#{customQuestionResponse.customQuestion.questionType=='textarea'}"
                                              requiredMessage="#{bundle['requiredField']}"/>
                                 <p:message id="cqMessagesTA" for="customQuestionResponseTextArea" display="text"/>

From cdaddfa30ca14c6e8e689b336110c5c10dfc6e99 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Wed, 1 Jul 2026 10:49:55 -0400
Subject: [PATCH 2/2] release note

---
 doc/release-notes/12483-gbr-req-question-fix.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/release-notes/12483-gbr-req-question-fix.md

diff --git a/doc/release-notes/12483-gbr-req-question-fix.md b/doc/release-notes/12483-gbr-req-question-fix.md
new file mode 100644
index 00000000000..1353fb93683
--- /dev/null
+++ b/doc/release-notes/12483-gbr-req-question-fix.md
@@ -0,0 +1 @@
+A bug that caused any required custom questions in guestbooks to still be optional has been fixed in the current UI.
\ No newline at end of file