diff --git a/src/main/java/se/su/dsv/scipro/conference/pages/ProjectConferencePage.java b/src/main/java/se/su/dsv/scipro/conference/pages/ProjectConferencePage.java index 452700e4d1..904cfd0479 100644 --- a/src/main/java/se/su/dsv/scipro/conference/pages/ProjectConferencePage.java +++ b/src/main/java/se/su/dsv/scipro/conference/pages/ProjectConferencePage.java @@ -92,7 +92,7 @@ public class ProjectConferencePage extends ProjectPage { subscriberModel.add(new SubscriberModel(projectModel.getObject() .getHeadSupervisor().getUser(), SupervisorConferencePage - .getAbsoluteForSupervisorConferenceURL(projectModel.getObject() + .getAbsoluteURL(projectModel.getObject() .getId()), NotificationPriority.LOW)); } @@ -100,7 +100,7 @@ public class ProjectConferencePage extends ProjectPage { .getProjectFollowers()) { subscriberModel.add(new SubscriberModel( projectFollower.getFollower().getUser(), SupervisorConferencePage - .getAbsoluteForSupervisorConferenceURL(projectModel.getObject() + .getAbsoluteURL(projectModel.getObject() .getId()), NotificationPriority.LOW)); } @@ -110,7 +110,7 @@ public class ProjectConferencePage extends ProjectPage { if (!student.getUser().equals(SciProSession.get().getUser())) subscriberModel .add(new SubscriberModel(student.getUser(), - getAbsoluteForProjectConferenceURL(projectModel.getObject() + getAbsoluteURL(projectModel.getObject() .getId()), NotificationPriority.LOW)); // Test-kod // subscriberModel.add(new @@ -162,7 +162,7 @@ public class ProjectConferencePage extends ProjectPage { .getAccessDeniedPage()); } - public static String getAbsoluteForProjectConferenceURL(Long id) { + public static String getAbsoluteURL(Long id) { PageParameters pageParameters = new PageParameters(); pageParameters.put(PROJECTID, id.toString()); return RequestUtils.toAbsolutePath(RequestCycle.get() diff --git a/src/main/java/se/su/dsv/scipro/conference/pages/SupervisorConferencePage.java b/src/main/java/se/su/dsv/scipro/conference/pages/SupervisorConferencePage.java index 2c5d8c5a0a..248bcb088d 100644 --- a/src/main/java/se/su/dsv/scipro/conference/pages/SupervisorConferencePage.java +++ b/src/main/java/se/su/dsv/scipro/conference/pages/SupervisorConferencePage.java @@ -95,7 +95,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage { if (!user.equals(SciProSession.get().getUser())) { subscriberModel .add(new SubscriberModel(user, - getAbsoluteForSupervisorConferenceURL(projectModel.getObject() + getAbsoluteURL(projectModel.getObject() .getId()), NotificationPriority.LOW)); } @@ -103,7 +103,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage { .getProjectFollowers()) { if (!user.equals(SciProSession.get().getUser())) { subscriberModel.add(new SubscriberModel(projectFollower.getFollower() - .getUser(), getAbsoluteForSupervisorConferenceURL(projectModel + .getUser(), getAbsoluteURL(projectModel .getObject().getId()), NotificationPriority.LOW)); } @@ -111,7 +111,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage { for (Student student : projectModel.getObject().getProjectParticipants()) { subscriberModel.add(new SubscriberModel(student.getUser(), - ProjectConferencePage.getAbsoluteForProjectConferenceURL(projectModel + ProjectConferencePage.getAbsoluteURL(projectModel .getObject().getId()), NotificationPriority.LOW)); } @@ -156,7 +156,7 @@ public class SupervisorConferencePage extends AbstractSupervisorPage { .getAccessDeniedPage()); } - public static String getAbsoluteForSupervisorConferenceURL(Long id) { + public static String getAbsoluteURL(Long id) { PageParameters pageParameters = new PageParameters(); pageParameters.add(PROJECTID, id.toString()); return RequestUtils.toAbsolutePath(RequestCycle.get()