From 7c17b1ba844c012c49c2a33a131e288133041af7 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Tue, 6 Dec 2016 17:16:41 -0500
Subject: [PATCH] #3505 - Fix permissions gathering for Dataset Page

---
 .../iq/dataverse/FileDownloadHelper.java      | 20 ++-----------------
 src/main/webapp/filesFragment.xhtml           |  4 ++--
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
index b6e34997008..d4035314b8f 100644
--- a/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
+++ b/src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
@@ -32,7 +32,7 @@ public class FileDownloadHelper implements java.io.Serializable {
 
     
     private final Map<Long, Boolean> fileDownloadPermissionMap = new HashMap<>(); // { FileMetadata.id : Boolean } 
-    private final Map<String, Boolean> datasetPermissionMap = new HashMap<>(); // { Permission human_name : Boolean }
+
 
     
     
@@ -169,24 +169,8 @@ public boolean doesSessionUserHavePermission(Permission permissionToCheck, FileM
             return false;
         }
         
-        
-               
-        String permName = permissionToCheck.getHumanName();
-       
-        // Has this check already been done? 
-        // 
-        if (this.datasetPermissionMap.containsKey(permName)){
-            // Yes, return previous answer
-            return this.datasetPermissionMap.get(permName);
-        }
-        
-        // Check the permission
-        //
         boolean hasPermission = this.permissionService.userOn(this.session.getUser(), objectToCheck).has(permissionToCheck);
-
-        // Save the permission
-        this.datasetPermissionMap.put(permName, hasPermission);
-        
+       
         // return true/false
         return hasPermission;
     }
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index bc6f7b8f90a..c84001a6a89 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -212,10 +212,10 @@
                 </ui:fragment>
 
                 <!-- Restricted File Icon -->
-                <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and ((empty fileMetadata.dataFile.id) or !(fileDownloadHelper.canDownloadFile(fileMetadata)) )}">
+                <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and !fileDownloadHelper.canDownloadFile(fileMetadata)}">                  
                     <span class="glyphicon glyphicon-lock text-danger"/>
                 </div>
-                <div class="file-icon-restricted-block" jsf:rendered="#{!(empty fileMetadata.dataFile.id) and fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata) }">
+                <div class="file-icon-restricted-block" jsf:rendered="#{fileMetadata.restricted and fileDownloadHelper.canDownloadFile(fileMetadata) }">
                     <span class="icon-unlock text-success"/>
                 </div>
             </div>