diff --git a/DLCM-Admin/src/main/java/ch/dlcm/business/NotificationService.java b/DLCM-Admin/src/main/java/ch/dlcm/business/NotificationService.java index 0d3f2da11de8bc72791b1cdbd3e95bbf8e1f6fc7..38cae2ad933690d384af65c08aefa2fcf8221701 100644 --- a/DLCM-Admin/src/main/java/ch/dlcm/business/NotificationService.java +++ b/DLCM-Admin/src/main/java/ch/dlcm/business/NotificationService.java @@ -240,7 +240,8 @@ public class NotificationService extends ResourceService<Notification> { SolidifyEventPublisher.getPublisher().publishEvent(Objects.requireNonNull(emailMessage)); } } - if (item.getNotificationType().getNotificationCategory().equals(NotificationCategory.INFO)) { + if (item.getNotificationType().getNotificationCategory() != null && item.getNotificationType().getNotificationCategory() + .equals(NotificationCategory.INFO)) { item.setNotificationStatus(NotificationStatus.NON_APPLICABLE); } return super.save(item); diff --git a/DLCM-Common/src/main/resources/locale/messages_dlcm.properties b/DLCM-Common/src/main/resources/locale/messages_dlcm.properties index f1fcd431742ed9a30d90e6775c69df8d98a914a9..49d067902d32f7b4994da848468094c87af69d48 100644 --- a/DLCM-Common/src/main/resources/locale/messages_dlcm.properties +++ b/DLCM-Common/src/main/resources/locale/messages_dlcm.properties @@ -464,6 +464,7 @@ notification.status.created=Creation notification.status.processed=Processed notification.status.pending=Pending notification.status.refused=Refused +notification.status.approved=Approved ########### # History # ###########