diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java index 0ba88d6..10429ad 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java @@ -340,6 +340,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C new AssociationToGroupAndNotifyThread( toCreate.getGroups(), toCreate.getChosenProfile(), + datasetUrl, datasetId, toCreate.getTitle(), aslSession.getUserFullName(), diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java index a5648ae..339da6f 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/threads/AssociationToGroupAndNotifyThread.java @@ -27,7 +27,9 @@ public class AssociationToGroupAndNotifyThread extends Thread { private static final Logger logger = LoggerFactory.getLogger(AssociationToGroupAndNotifyThread.class); private static final String PRODUCT_ASSOCIATED_TO_GROUP_SUBJECT = "Product $PRODUCT added to group $GROUP"; - private static final String PRODUCT_ASSOCIATED_TO_GROUP_BODY = "Dear user,'\n'a new product named $TITLE has been just published to the Data Catalogue group $GROUP by $USER_FULLNAME."; + private static final String PRODUCT_ASSOCIATED_TO_GROUP_BODY = "Dear user,
a new product named $TITLE has been " + + "just published and added to the group $GROUP by $USER_FULLNAME.
" + + "You can find it here $DATASET_URL"; private String groupTitle; private String datasetId; @@ -38,6 +40,7 @@ public class AssociationToGroupAndNotifyThread extends Thread { private String organization; private List groups; private HttpServletRequest request; + private String datasetUrl; /** * @param list @@ -46,7 +49,7 @@ public class AssociationToGroupAndNotifyThread extends Thread { * @param username * @param catalogue */ - public AssociationToGroupAndNotifyThread(List groups, String groupTitle, String datasetId, String datasetTitle, String userFullName, + public AssociationToGroupAndNotifyThread(List groups, String groupTitle, String datasetUrl, String datasetId, String datasetTitle, String userFullName, String username, DataCatalogue catalogue, String organization, HttpServletRequest request) { this.request = request; this.groups = groups; @@ -57,6 +60,7 @@ public class AssociationToGroupAndNotifyThread extends Thread { this.organization = organization; this.datasetTitle = datasetTitle; this.userFullName = userFullName; + this.datasetUrl = datasetUrl; } @Override @@ -156,7 +160,7 @@ public class AssociationToGroupAndNotifyThread extends Thread { EmailNotification mailToSend = new EmailNotification( adminsEmails, PRODUCT_ASSOCIATED_TO_GROUP_SUBJECT.replace("$TITLE", datasetTitle).replace("$GROUP", groupTitle), - PRODUCT_ASSOCIATED_TO_GROUP_BODY.replace("$TITLE", datasetTitle).replace("$GROUP", groupTitle).replace("$USER_FULLNAME", userFullName), + PRODUCT_ASSOCIATED_TO_GROUP_BODY.replace("$TITLE", datasetTitle).replace("$GROUP", groupTitle).replace("$USER_FULLNAME", userFullName).replace("$DATASET_URL", datasetUrl), request); mailToSend.sendEmail();