Skip to content

#3505 - Fix permissions gathering for Dataset Page #3512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 1 commit into from
Dec 8, 2016
Merged

#3505 - Fix permissions gathering for Dataset Page #3512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions src/main/java/edu/harvard/iq/dataverse/FileDownloadHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }




Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/filesFragment.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down