Merge branch 'mpdl-develop' into file-performance-simple

MPDL · Nov 23, 2022 · d23f4de · d23f4de
2 parents ac2317f + 9b3370b
commit d23f4de
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java b/src/main/java/edu/harvard/iq/dataverse/util/MailUtil.java
@@ -34,8 +34,12 @@ public static String getSubjectTextBasedOnNotification(UserNotification userNoti
         List<String> rootDvNameAsList = Arrays.asList(BrandingUtil.getInstallationBrandName());
         String datasetDisplayName = "";
 
-        if (objectOfNotification != null && (objectOfNotification instanceof Dataset)  ) {
-            datasetDisplayName = ((Dataset)objectOfNotification).getDisplayName();
+        if (objectOfNotification != null) {
+            if (objectOfNotification instanceof Dataset) {
+                datasetDisplayName = ((Dataset) objectOfNotification).getDisplayName();
+            } else if (objectOfNotification instanceof DatasetVersion) {
+                datasetDisplayName = ((DatasetVersion) objectOfNotification).getDataset().getDisplayName();
+            }
         }
 
         switch (userNotification.getType()) {