#7406 remove panel

IQSS · Dec 1, 2020 · 47766c9 · 47766c9
1 parent af3e008
commit 47766c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/webapp/file-download-button-fragment.xhtml b/src/main/webapp/file-download-button-fragment.xhtml
@@ -175,15 +175,16 @@
     <!-- Download Options -->
 
     <!-- Request Access Options -->
-    <p:outputPanel id="requestButtons">
+
     <ui:fragment rendered="#{!fileMetadata.datasetVersion.deaccessioned and !fileDownloadHelper.canDownloadFile(fileMetadata)
                              and fileMetadata.dataFile.owner.fileAccessRequest}">
         <li class="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? 'disabled' : ''}">
             <p:commandLink styleClass="btn-request" rendered="#{fileDownloadHelper.session.user.authenticated 
                                                                     and !requestAccessPopupRequired}"
                         process="@this"
                         actionListener="#{fileDownloadHelper.requestAccess(fileMetadata.dataFile)}"
-                        update="@this,@([id$=requestButtons])"                       
+                        update="@this,@([id$=requestButtonNoPopup])"    
+                        id="requestButtonNoPopup"
                         disabled="#{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user)}">
                 #{fileMetadata.dataFile.fileAccessRequesters.contains(dataverseSession.user) ? bundle['file.accessRequested'] : bundle['file.requestAccess']}
             </p:commandLink>
@@ -206,7 +207,7 @@
             </p:commandLink>
         </li>
     </ui:fragment>
-    </p:outputPanel>    
+
     <!-- END: Request Access Options -->
 
     <!-- Explore Options -->

diff --git a/src/main/webapp/file-request-access-popup-fragment.xhtml b/src/main/webapp/file-request-access-popup-fragment.xhtml
@@ -42,7 +42,7 @@
         <div class="button-block">
             <p:commandButton styleClass="btn btn-default" value="#{bundle.acceptTerms}" 
                            action="#{fileDownloadHelper.requestAccessIndirect()}"    
-                           update="@([id$=requestAccessPopupButton]),  @([id$=requestButtons]))" oncomplete="PF('requestAccessPopup').hide();">
+                           update="@([id$=requestAccessPopupButton]),  @([id$=requestAccessPopupLink]))" oncomplete="PF('requestAccessPopup').hide();">
             </p:commandButton>
             <button class="btn btn-link" onclick="PF('requestAccessPopup').hide();PF('blockDatasetForm').hide();" type="button">
                 #{bundle.cancel}