getAbsoluteURL
Change-Id: Idf8187723746f79b605097436ab7ced5e2e67db5
This commit is contained in:
parent
a31147d46c
commit
0b7e46434d
src/main/java/se/su/dsv/scipro/conference/pages
@ -92,7 +92,7 @@ public class ProjectConferencePage extends ProjectPage {
|
|||||||
subscriberModel.add(new SubscriberModel(projectModel.getObject()
|
subscriberModel.add(new SubscriberModel(projectModel.getObject()
|
||||||
.getHeadSupervisor().getUser(),
|
.getHeadSupervisor().getUser(),
|
||||||
SupervisorConferencePage
|
SupervisorConferencePage
|
||||||
.getAbsoluteForSupervisorConferenceURL(projectModel.getObject()
|
.getAbsoluteURL(projectModel.getObject()
|
||||||
.getId()), NotificationPriority.LOW));
|
.getId()), NotificationPriority.LOW));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,7 +100,7 @@ public class ProjectConferencePage extends ProjectPage {
|
|||||||
.getProjectFollowers()) {
|
.getProjectFollowers()) {
|
||||||
subscriberModel.add(new SubscriberModel(
|
subscriberModel.add(new SubscriberModel(
|
||||||
projectFollower.getFollower().getUser(), SupervisorConferencePage
|
projectFollower.getFollower().getUser(), SupervisorConferencePage
|
||||||
.getAbsoluteForSupervisorConferenceURL(projectModel.getObject()
|
.getAbsoluteURL(projectModel.getObject()
|
||||||
.getId()), NotificationPriority.LOW));
|
.getId()), NotificationPriority.LOW));
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -110,7 +110,7 @@ public class ProjectConferencePage extends ProjectPage {
|
|||||||
if (!student.getUser().equals(SciProSession.get().getUser()))
|
if (!student.getUser().equals(SciProSession.get().getUser()))
|
||||||
subscriberModel
|
subscriberModel
|
||||||
.add(new SubscriberModel(student.getUser(),
|
.add(new SubscriberModel(student.getUser(),
|
||||||
getAbsoluteForProjectConferenceURL(projectModel.getObject()
|
getAbsoluteURL(projectModel.getObject()
|
||||||
.getId()), NotificationPriority.LOW));
|
.getId()), NotificationPriority.LOW));
|
||||||
// Test-kod
|
// Test-kod
|
||||||
// subscriberModel.add(new
|
// subscriberModel.add(new
|
||||||
@ -162,7 +162,7 @@ public class ProjectConferencePage extends ProjectPage {
|
|||||||
.getAccessDeniedPage());
|
.getAccessDeniedPage());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getAbsoluteForProjectConferenceURL(Long id) {
|
public static String getAbsoluteURL(Long id) {
|
||||||
PageParameters pageParameters = new PageParameters();
|
PageParameters pageParameters = new PageParameters();
|
||||||
pageParameters.put(PROJECTID, id.toString());
|
pageParameters.put(PROJECTID, id.toString());
|
||||||
return RequestUtils.toAbsolutePath(RequestCycle.get()
|
return RequestUtils.toAbsolutePath(RequestCycle.get()
|
||||||
|
@ -95,7 +95,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage {
|
|||||||
if (!user.equals(SciProSession.get().getUser())) {
|
if (!user.equals(SciProSession.get().getUser())) {
|
||||||
subscriberModel
|
subscriberModel
|
||||||
.add(new SubscriberModel(user,
|
.add(new SubscriberModel(user,
|
||||||
getAbsoluteForSupervisorConferenceURL(projectModel.getObject()
|
getAbsoluteURL(projectModel.getObject()
|
||||||
.getId()), NotificationPriority.LOW));
|
.getId()), NotificationPriority.LOW));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage {
|
|||||||
.getProjectFollowers()) {
|
.getProjectFollowers()) {
|
||||||
if (!user.equals(SciProSession.get().getUser())) {
|
if (!user.equals(SciProSession.get().getUser())) {
|
||||||
subscriberModel.add(new SubscriberModel(projectFollower.getFollower()
|
subscriberModel.add(new SubscriberModel(projectFollower.getFollower()
|
||||||
.getUser(), getAbsoluteForSupervisorConferenceURL(projectModel
|
.getUser(), getAbsoluteURL(projectModel
|
||||||
.getObject().getId()), NotificationPriority.LOW));
|
.getObject().getId()), NotificationPriority.LOW));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,7 +111,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage {
|
|||||||
|
|
||||||
for (Student student : projectModel.getObject().getProjectParticipants()) {
|
for (Student student : projectModel.getObject().getProjectParticipants()) {
|
||||||
subscriberModel.add(new SubscriberModel(student.getUser(),
|
subscriberModel.add(new SubscriberModel(student.getUser(),
|
||||||
ProjectConferencePage.getAbsoluteForProjectConferenceURL(projectModel
|
ProjectConferencePage.getAbsoluteURL(projectModel
|
||||||
.getObject().getId()), NotificationPriority.LOW));
|
.getObject().getId()), NotificationPriority.LOW));
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -156,7 +156,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage {
|
|||||||
.getAccessDeniedPage());
|
.getAccessDeniedPage());
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String getAbsoluteForSupervisorConferenceURL(Long id) {
|
public static String getAbsoluteURL(Long id) {
|
||||||
PageParameters pageParameters = new PageParameters();
|
PageParameters pageParameters = new PageParameters();
|
||||||
pageParameters.add(PROJECTID, id.toString());
|
pageParameters.add(PROJECTID, id.toString());
|
||||||
return RequestUtils.toAbsolutePath(RequestCycle.get()
|
return RequestUtils.toAbsolutePath(RequestCycle.get()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user