From 08f161097500fc289430e21726eb98c6e3d4755d Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 31 Jan 2025 11:14:17 -0500
Subject: [PATCH 1/3] fix gbar - no q's when no gb, toA from hamburger menus

---
 src/main/webapp/guestbook-terms-popup-fragment.xhtml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/guestbook-terms-popup-fragment.xhtml b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
index 6eec4f100b1..7d157fcb72c 100644
--- a/src/main/webapp/guestbook-terms-popup-fragment.xhtml
+++ b/src/main/webapp/guestbook-terms-popup-fragment.xhtml
@@ -41,7 +41,7 @@
                         src="#{DatasetUtil:getLicenseIcon(workingVersion)}"
                         title="#{DatasetUtil:getLicenseDescription(workingVersion)}"
                         style="display: none" onload="this.style.display='inline'" />
-                    <a 
+                    <a
                         href="#{DatasetUtil:getLicenseURI(workingVersion)}"
                         title="#{DatasetUtil:getLicenseDescription(workingVersion)}"
                         target="_blank">#{DatasetUtil:getLicenseName(workingVersion)}
@@ -60,7 +60,7 @@
             <div class="form-group"
                 jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfUse}">
                 <label jsf:for="fdTermsOfuse" class="col-sm-3 control-label">
-                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']} 
+                    #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
                 </label>
                 <h:outputText id="fdTermsOfUse" class="col-sm-6"
                     value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfUse)}"
@@ -134,7 +134,7 @@
             </div>
         </ui:fragment>
         <div class="form-group"
-            jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess and hasRestrictedFile}">
+            jsf:rendered="#{!empty workingVersion.termsOfUseAndAccess.termsOfAccess and (hasRestrictedFile or !empty fileDownloadHelper.filesForRequestAccess)}">
             <label jsf:for="fdTermsOfAccess" class="col-sm-3 control-label">
                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
             </label>
@@ -142,7 +142,7 @@
                 value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}"
                 escape="false" />
         </div>
-            <p:fragment rendered="#{guestbookAndTermsPopupRequired and ((termsGuestbookPopupAction != bundle.download) != guestbookPopupRequiredAtDownload)}" id="guestbookUIFragment">
+            <p:fragment rendered="#{guestbookAndTermsPopupRequired and guestbookPopupRequired}" id="guestbookUIFragment">
                 <div class="container messagePanel">
                     <iqbs:messages collapsible="true" />
                 </div>
@@ -179,7 +179,7 @@
                                      styleClass="form-control" value="#{guestbookResponse.email}"
                                      requiredMessage="#{bundle['requiredField']}"
                                      >
-                        </p:inputText>  
+                        </p:inputText>
                         <p:message id="emailMessages" for="guestbookuser_email" display="text"/>
                     </div>
                 </div>

From 7601c0002694973e62d97591dac1d9d8fff9de38 Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 31 Jan 2025 11:24:05 -0500
Subject: [PATCH 2/3] text tweaks

---
 src/main/java/propertyFiles/Bundle.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 1601487fbbe..dfcde5ee14a 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -72,7 +72,7 @@ affiliation=Affiliation
 storage=Storage
 curationLabels=Curation Labels
 metadataLanguage=Dataset Metadata Language
-guestbookEntryOption=Guestbook Entry Option
+guestbookEntryOption=Guestbook Mode
 pidProviderOption=PID Provider Option
 createDataverse=Create Dataverse
 remove=Remove
@@ -885,7 +885,7 @@ dataverse.curationLabels.title=A set of curation status labels that are used to
 dataverse.curationLabels.disabled=Disabled
 dataverse.category=Category
 dataverse.category.title=The type that most closely reflects this dataverse.
-dataverse.guestbookentryatrequest.title=Whether Guestbooks are displayed to users when they request file access or when they download files.
+dataverse.guestbookentryatrequest.title=Whether Guestbooks (when configured for a dataset) are displayed to users when they request file access or when they download files.
 dataverse.pidProvider.title=The source of PIDs (DOIs, Handles, etc.) when a new PID is created.
 dataverse.type.selectTab.top=Select one...
 dataverse.type.selectTab.researchers=Researcher

From d2a7fd1e58c9895748826748169cf8f6cf9ccf8f Mon Sep 17 00:00:00 2001
From: Jim Myers <qqmyers@hotmail.com>
Date: Fri, 31 Jan 2025 11:41:39 -0500
Subject: [PATCH 3/3] release note

---
 doc/release-notes/11203-request-access-fixes.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/release-notes/11203-request-access-fixes.md

diff --git a/doc/release-notes/11203-request-access-fixes.md b/doc/release-notes/11203-request-access-fixes.md
new file mode 100644
index 00000000000..7087588c916
--- /dev/null
+++ b/doc/release-notes/11203-request-access-fixes.md
@@ -0,0 +1,2 @@
+Bugs that caused 1) guestbook questions to appear along with terms of use/terms of access in the request access dialog when no guestbook was configured, and 2) terms of access to not be shown when using the per-file request access/download menu items have been fixed.
+Text related to configuring the choice to have guestbooks appear when file access is requested or when files are downloaded has been updated to make it clearer that this only affects datasets where guestbooks have been configured.
\ No newline at end of file