#6524 allow user with view draft permission to get size of download

IQSS · Feb 4, 2020 · 7237c4f · 7237c4f
1 parent 8885157
commit 7237c4f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
@@ -893,24 +893,18 @@ public long findStorageSize(Dataset dataset, boolean countCachedExtras, String m
         if (dataset.isHarvested()) {
             return 0L;
         }
-
-        System.out.print("mode: " + mode);
-        System.out.print("dataset: " + dataset);
-        System.out.print("version: " + version);
+
         List<DataFile> filesToTalley = new ArrayList();
 
         if (version == null || (mode != null &&  mode.equals("storage"))){
             filesToTalley = dataset.getFiles();
         } else {
             List <FileMetadata>  fmds = version.getFileMetadatas();
-            System.out.print("FileMetadata: " + fmds.size());   
             for (FileMetadata fmd : fmds){
-                filesToTalley.add(fmd.getDataFile());
-            }
-
+                    filesToTalley.add(fmd.getDataFile());
+            }           
         }
-
-        System.out.print("filesToTalley: " + filesToTalley.size());      
+
 
         //CACHED EXTRAS FOR DOWNLOAD?
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetStorageSizeCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/GetDatasetStorageSizeCommand.java
@@ -73,7 +73,7 @@ public Map<String, Set<Permission>> getRequiredPermissions() {
         // for data file check permission on owning dataset
         return Collections.singletonMap("",
          mode != null &&  mode.equals("storage") ? Collections.singleton(Permission.ViewUnpublishedDataset)
-                : Collections.<Permission>emptySet());
+                : version !=null && version.isDraft() ? Collections.singleton(Permission.ViewUnpublishedDataset) : Collections.<Permission>emptySet());
     }
 
 }