using notificationcontroller
Change-Id: Ie9e4389df4adaddb3e23fae9e85ead3d51970aef
This commit is contained in:
parent
04d60a682d
commit
8a74bac9a6
@ -9,12 +9,15 @@ import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
||||
import org.apache.wicket.IClusterable;
|
||||
import org.apache.wicket.PageParameters;
|
||||
import org.apache.wicket.Request;
|
||||
import org.apache.wicket.RequestCycle;
|
||||
import org.apache.wicket.injection.web.InjectorHolder;
|
||||
import org.apache.wicket.protocol.http.RequestUtils;
|
||||
import org.apache.wicket.spring.injection.annot.SpringBean;
|
||||
|
||||
import se.su.dsv.scipro.SciProSession;
|
||||
import se.su.dsv.scipro.conference.pages.SupervisorConferencePage;
|
||||
import se.su.dsv.scipro.data.controllers.NotificationController;
|
||||
import se.su.dsv.scipro.data.controllers.NotificationMessage;
|
||||
import se.su.dsv.scipro.data.dao.interfaces.WebNotificationDao;
|
||||
@ -27,6 +30,7 @@ import se.su.dsv.scipro.data.dataobjects.Recipient;
|
||||
import se.su.dsv.scipro.data.dataobjects.User;
|
||||
import se.su.dsv.scipro.data.enums.NotificationEventType;
|
||||
import se.su.dsv.scipro.data.enums.NotificationPriority;
|
||||
import se.su.dsv.scipro.message.pages.PrivateMessagesPage;
|
||||
import se.su.dsv.scipro.security.auth.roles.Roles;
|
||||
import se.su.dsv.scipro.util.PropsUtils;
|
||||
|
||||
@ -78,9 +82,6 @@ public class PrivateMessageModel implements IClusterable {
|
||||
}
|
||||
|
||||
private void createNotification(final User user,final String message){
|
||||
String absoluteURL = RequestUtils.toAbsolutePath(RequestCycle.get().getRequest().getRelativePathPrefixToWicketHandler());
|
||||
absoluteURL += relativePath;
|
||||
String relativeURL = relativePath;
|
||||
Properties props = null;
|
||||
try {
|
||||
props = PropsUtils.load("notification.properties");
|
||||
@ -90,18 +91,22 @@ public class PrivateMessageModel implements IClusterable {
|
||||
String mailSubject = props.getProperty("mailSubject");
|
||||
String privateMessageNotification = props.getProperty("privateMessageNotification");
|
||||
String twoNewLines = props.getProperty("twoNewLines");
|
||||
String linkText = props.getProperty("linkText");
|
||||
|
||||
|
||||
String webNotificationMessage = SciProSession.get()
|
||||
.getUser()
|
||||
+ privateMessageNotification;
|
||||
|
||||
String mailMessage = webNotificationMessage + twoNewLines + message + twoNewLines + linkText + absoluteURL;
|
||||
String mailMessage = webNotificationMessage + twoNewLines + message;
|
||||
|
||||
NotificationMessage notificationMessage = new NotificationMessage(webNotificationMessage, mailSubject, mailMessage);
|
||||
notificationController.processNotification(user, notificationMessage,
|
||||
relativeURL, NotificationPriority.MEDIUM);
|
||||
getAbsoluteForPrivateMessageURL(), NotificationPriority.MEDIUM);
|
||||
|
||||
}
|
||||
|
||||
private String getAbsoluteForPrivateMessageURL() {
|
||||
PageParameters pageParameters = new PageParameters();
|
||||
return RequestUtils.toAbsolutePath(RequestCycle.get().urlFor(PrivateMessagesPage.class, pageParameters).toString());
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user