Merge pull request #11808 from QualitativeDataRepository/IQSS/11800-GB-request_access_errors

IQSS/11800 Fix GB - Request Access errors

Author: ofahimIQSS

doc/release-notes/11800-qb-ra-fixes.md

@@ -0,0 +1,2 @@
+This release fixes problems with guestbook questions being displayed at download when files are selected from the dataset files table
+when guestbook-at-request is enabled and not displaying when they should when access is requested from the file page. 

src/main/java/edu/harvard/iq/dataverse/FilePage.java

@@ -420,6 +420,11 @@ public boolean isGuestbookPopupRequiredAtDownload(){
         DatasetVersion workingVersion = fileMetadata.getDatasetVersion();
         return FileUtil.isGuestbookPopupRequired(workingVersion) && !workingVersion.getDataset().getEffectiveGuestbookEntryAtRequest();
     }
+    
+    public boolean isGuestbookPopupRequired(){
+        DatasetVersion workingVersion = fileMetadata.getDatasetVersion();
+        return FileUtil.isGuestbookPopupRequired(workingVersion);
+    }
 
     public void setFileMetadata(FileMetadata fileMetadata) {
         this.fileMetadata = fileMetadata;

src/main/webapp/file.xhtml

@@ -374,6 +374,7 @@
                                         <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
                                         <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
                                         <ui:param name="termsGuestbookPopupAction" value="#{bundle.download}"/>
+                                        <ui:param name="guestbookPopupRequired" value="#{FilePage.guestbookPopupRequired}"/>
                                         <ui:param name="guestbookPopupRequiredAtDownload" value="#{FilePage.guestbookPopupRequiredAtDownload}"/>
                                     </ui:include>
                                 </ui:fragment>
@@ -681,6 +682,7 @@
                             <ui:param name="fileDownloadHelper" value="#{FilePage.fileDownloadHelper}"/>
                             <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
                             <ui:param name="termsGuestbookPopupAction" value="#{FilePage.termsGuestbookPopupAction}"/>
+                            <ui:param name="guestbookPopupRequired" value="#{FilePage.guestbookPopupRequired}"/>
                             <ui:param name="guestbookPopupRequiredAtDownload" value="#{FilePage.guestbookPopupRequiredAtDownload}"/>
 
                         </ui:include>

src/main/webapp/guestbook-terms-popup-fragment.xhtml

@@ -142,7 +142,7 @@
                 value="#{MarkupChecker:sanitizeBasicHTML(workingVersion.termsOfUseAndAccess.termsOfAccess)}"
                 escape="false" />
         </div>
-            <p:fragment rendered="#{guestbookAndTermsPopupRequired and guestbookPopupRequired}" id="guestbookUIFragment">
+            <p:fragment rendered="#{guestbookAndTermsPopupRequired and (((termsGuestbookPopupAction != bundle.download) != guestbookPopupRequiredAtDownload) and guestbookPopupRequired)}" id="guestbookUIFragment">
                 <div class="container messagePanel">
                     <iqbs:messages collapsible="true" />
                 </div>