#2657 Clarify the levels of permissions in Manage Permissions popup

IQSS · Sep 15, 2016 · 5f7b661 · 5f7b661
1 parent 512bb4d
commit 5f7b661
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -789,7 +789,7 @@ dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.enterName=Enter Use
 dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.invalidMsg=No matches found.
 dataverse.permissions.usersOrGroups.assignDialog.userOrGroup.requiredMsg=Please select at least one user or group.
 dataverse.permissions.usersOrGroups.assignDialog.role.description=These are the permissions associated with the selected role.
-dataverse.permissions.usersOrGroups.assignDialog.role.warning=Assigning the {0} role means the user(s) will have the {0} role applied to all {1} within this {2}.
+dataverse.permissions.usersOrGroups.assignDialog.role.warning=Assigning the {0} role means the user(s) will also have the {0} role applied to all {1} within this {2}.
 dataverse.permissions.usersOrGroups.assignDialog.role.requiredMsg=Please select a role to assign.
 
 # roles-edit.xhtml

diff --git a/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java
@@ -383,11 +383,11 @@ public DataverseRole getAssignedRole() {
     public String getAssignedRoleObjectTypes(){
         String retString = "";
         if (selectedRoleId != null) {
-            if (dataverseRolePermissionHelper.hasDataversePermissions(selectedRoleId)){
+            if (dataverseRolePermissionHelper.hasDataversePermissions(selectedRoleId) && dvObject instanceof Dataverse){
                 String dvLabel = ResourceBundle.getBundle("Bundle").getString("dataverses");
                 retString = dvLabel;
             }
-            if (dataverseRolePermissionHelper.hasDatasetPermissions(selectedRoleId)){
+            if (dataverseRolePermissionHelper.hasDatasetPermissions(selectedRoleId) && dvObject instanceof Dataverse){
                 String dsLabel = ResourceBundle.getBundle("Bundle").getString("datasets");
                 if(!retString.isEmpty()) {
                     retString +=", " +  dsLabel;