Added File Downloader disclaimer #2654

IQSS · Oct 20, 2015 · cebbf98 · cebbf98
1 parent 583ace0
commit cebbf98
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties
@@ -140,6 +140,8 @@ notification.generic.objectDeleted=The dataverse, dataset, or file for this noti
 notification.access.granted.dataverse=You have been granted the {0} role for <a href="/dataverse/{1}" title="{2}">{2}</a>.
 notification.access.granted.dataset=You have been granted the {0} role for <a href="/dataset.xhtml?persistentId={1}" title="{2}">{2}</a>.
 notification.access.granted.datafile=You have been granted the {0} role for file in <a href="/dataset.xhtml?persistentId={1}" title="{2}">{2}</a>.
+notification.access.granted.fileDownloader.additionalDataverse= You now have access to all restricted and unrestricted files in this dataverse.
+notification.access.granted.fileDownloader.additionalDataset= You now have access to all restricted and unrestricted files in this dataset.
 notification.access.revoked.dataverse=You have been removed from a role in <a href="/dataverse/{1}" title="{2}">{2}</a>.
 notification.access.revoked.dataset=You have been removed from a role in <a href="/dataset.xhtml?persistentId={1}" title="{2}">{2}</a>.
 notification.access.revoked.datafile=You have been removed from a role in <a href="/dataset.xhtml?persistentId={1}" title="{2}">{2}</a>.

diff --git a/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/MailServiceBean.java
@@ -323,6 +323,14 @@ private String getMessageTextBasedOnNotification(UserNotification userNotificati
                 pattern = ResourceBundle.getBundle("Bundle").getString("notification.email.assignRole");
                 String[] paramArrayAssignRole = {joinedRoleNames, dvObjTypeStr, dvObj.getDisplayName(), dvObjURL};
                 messageText += MessageFormat.format(pattern, paramArrayAssignRole);
+                if (joinedRoleNames.contains("File Downloader")){
+                    if (dvObjTypeStr.equals("dataset")){
+                        messageText +=  ResourceBundle.getBundle("Bundle").getString("notification.access.granted.fileDownloader.additionalDataset");
+                    }
+                    if (dvObjTypeStr.equals("dataverse")){
+                        messageText +=  ResourceBundle.getBundle("Bundle").getString("notification.access.granted.fileDownloader.additionalDataverse");
+                    }                   
+                }
                 return messageText;
             case REVOKEROLE:
                 dvObj = (DvObject) targetObject;

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
@@ -213,6 +213,9 @@
                                                         <f:param value="#{item.theObject.getAlias()}"/>
                                                         <f:param value="#{item.theObject.getDisplayName()}"/>
                                                     </h:outputFormat>  
+                                                    <ui:fragment rendered="#{item.roleString == 'File Downloader'}">
+                                                        <h:outputText value="#{bundle['notification.access.granted.fileDownloader.additionalDataverse']}" />
+                                                    </ui:fragment>
                                                     </ui:fragment>
                                                     <ui:fragment rendered="#{item.theObject.isInstanceofDataset()}">
                                                     <f:param value="#{item.roleString}"/>
@@ -221,7 +224,10 @@
                                                         <f:param value="#{item.roleString}"/>
                                                         <f:param value="#{item.theObject.getGlobalId()}"/>
                                                         <f:param value="#{item.theObject.getDisplayName()}"/>
-                                                    </h:outputFormat>  
+                                                    </h:outputFormat> 
+                                                    <ui:fragment rendered="#{item.roleString == 'File Downloader'}">
+                                                        <h:outputText value="#{bundle['notification.access.granted.fileDownloader.additionalDataset']}" />
+                                                    </ui:fragment>
                                                     </ui:fragment>
                                                     <ui:fragment rendered="#{item.theObject.isInstanceofDataFile()}">
                                                     <f:param value="#{item.roleString}"/>
@@ -232,6 +238,7 @@
                                                         <f:param value="#{item.theObject.getOwner().getDisplayName()}"/>
                                                     </h:outputFormat>  
                                                     </ui:fragment>
+
                                                 </ui:fragment>
                                                 <ui:fragment rendered="#{item.type == 'REVOKEROLE'}">
                                                     <ui:fragment rendered="#{item.theObject.isInstanceofDataverse()}">