Skip to content

Commit

Permalink
#2657 Remove DV from permissions caveat
Browse files Browse the repository at this point in the history
  • Loading branch information
sekmiller committed Sep 15, 2016
1 parent 5f7b661 commit 04f87b8
Showing 1 changed file with 8 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ public DvObject getDvObject() {

public void setDvObject(DvObject dvObject) {
this.dvObject = dvObject;
/*
SEK 09/15/2016 - may need to do something here if permissions are transmitted/inherited from dataverse to dataverse
*/

/*if (dvObject instanceof DvObjectContainer) {
inheritAssignments = !((DvObjectContainer) dvObject).isPermissionRoot();
}*/
Expand Down Expand Up @@ -383,10 +387,14 @@ public DataverseRole getAssignedRole() {
public String getAssignedRoleObjectTypes(){
String retString = "";
if (selectedRoleId != null) {
/* SEK 09/15/2016 SEK commenting out for now
because permissions are not inherited
if (dataverseRolePermissionHelper.hasDataversePermissions(selectedRoleId) && dvObject instanceof Dataverse){
String dvLabel = ResourceBundle.getBundle("Bundle").getString("dataverses");
retString = dvLabel;
}
*/
if (dataverseRolePermissionHelper.hasDatasetPermissions(selectedRoleId) && dvObject instanceof Dataverse){
String dsLabel = ResourceBundle.getBundle("Bundle").getString("datasets");
if(!retString.isEmpty()) {
Expand Down

0 comments on commit 04f87b8

Please sign in to comment.