Globus downloads should not be subject to the multi-file zip download…

… size limits. #11057
IQSS · Jan 14, 2025 · 71de542 · 71de542
1 parent 3de704b
commit 71de542
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
@@ -366,7 +366,7 @@
                     </p>
                 </div>
             </div>
-            <div class="row" jsf:rendered="#{(DatasetPage.sizeOfSelectedMaxNumeric gt settingsWrapper.zipDownloadLimit)
+            <div class="row" jsf:rendered="#{(!DatasetPage.isVersionHasGlobus()) and (DatasetPage.sizeOfSelectedMaxNumeric gt settingsWrapper.zipDownloadLimit)
                                              and DatasetPage.selectedFiles.size() > 1}">
                 <div class="col-xs-12 bg-warning text-left" style="font-weight:normal;padding-top:.5em;">
                     <h:outputFormat value="#{bundle['file.zip.download.exceeds.limit']}">
@@ -544,7 +544,12 @@
 
                     <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
                                                     fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
-                     <ui:fragment rendered="#{DatasetPage.isShowQueryButton(fileMetadata.dataFile.id) and fileDownloadHelper.canDownloadFile(fileMetadata)}">
+                    <ui:fragment rendered="#{fileMetadata.dataFile.tabularData
+                                             and fileMetadata.dataFile.released
+                                             and not fileMetadata.dataFile.restricted
+                                             and not dataFileServiceBean.isActivelyEmbargoed(fileMetadata)
+                                             and DatasetPage.isShowQueryButton(fileMetadata.dataFile.id)
+                                             and fileDownloadHelper.canDownloadFile(fileMetadata)}">                         
                         <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{DatasetPage.getQueryToolsForDataFile(fileMetadata.dataFile.id).get(0).getDisplayNameLang()}"
                             href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(!empty fileMetadata.dataFile.globalId ? 'persistentId=' : 'fileId=').concat(!empty fileMetadata.dataFile.globalId ? fileMetadata.dataFile.globalId.asString() : fileMetadata.dataFile.id).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber)).concat('&amp;toolType=QUERY')}">
                             <img src="#{resource['images/Robot-Icon_2.png']}"  width="32" height="32" /><span class="sr-only">#{bundle.preview} "#{empty(fileMetadata.directoryLabel) ? "":fileMetadata.directoryLabel.concat("/")}#{fileMetadata.label}"</span>