From 30d115399f2da6a65dd6950e1b35ce23011e38bf Mon Sep 17 00:00:00 2001
From: Fredrik Friis <fred-fri@dsv.su.se>
Date: Thu, 1 Mar 2012 13:27:39 +0900
Subject: [PATCH] fixed some saves
---
.../se/su/dsv/scipro/project/panels/NotificationsPanel.java | 4 ++--
src/main/java/se/su/dsv/scipro/user/facade/UserFacade.java | 6 +++---
.../scipro/workerthreads/CheckPlagiarismEventWorker.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java b/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java
index b223e77379..18e3c20128 100644
--- a/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java
+++ b/src/main/java/se/su/dsv/scipro/project/panels/NotificationsPanel.java
@@ -97,7 +97,7 @@ public class NotificationsPanel extends Panel {
public void onClick(AjaxRequestTarget target) {
WebNotification notification = item.getModelObject();
notification.setReadByUser(true);
- webNotificationDao.save(notification);
+ notification = webNotificationDao.save(notification);
target.addComponent(webMarkupContainer);
countOfNotifications = numberOfNotificationsModel.getObject();
}
@@ -115,7 +115,7 @@ public class NotificationsPanel extends Panel {
for (WebNotification webnotification : webNotificationDao
.getWebNotifications(SciProSession.get().getUser())) {
webnotification.setReadByUser(true);
- webNotificationDao.save(webnotification);
+ notification = webNotificationDao.save(webnotification);
}
countOfNotifications = numberOfNotificationsModel.getObject();
target.addComponent(webMarkupContainer);
diff --git a/src/main/java/se/su/dsv/scipro/user/facade/UserFacade.java b/src/main/java/se/su/dsv/scipro/user/facade/UserFacade.java
index 45bb723671..1b72f92d92 100644
--- a/src/main/java/se/su/dsv/scipro/user/facade/UserFacade.java
+++ b/src/main/java/se/su/dsv/scipro/user/facade/UserFacade.java
@@ -41,13 +41,13 @@ public class UserFacade {
//the line below is why the unit disappears when saving a supervisor profile- the unit is never specified so it saves null over the existing value.
// employee.getKeywords().setKeywords(keywords);
employee.getCapabilities().setLanguages(languages);
- supervisorDao.save(employee);
+ employee = supervisorDao.save(employee);
userDao.save(employee.getUser());
}
@Transactional
- public void saveUserProfileData(final User user){
+ public void saveUserProfileData(User user){
if(user == null)
throw new IllegalArgumentException("Null user is not allowed");
- userDao.save(user);
+ user = userDao.save(user);
}
}
diff --git a/src/main/java/se/su/dsv/scipro/workerthreads/CheckPlagiarismEventWorker.java b/src/main/java/se/su/dsv/scipro/workerthreads/CheckPlagiarismEventWorker.java
index 79e23f42b3..3173619f92 100644
--- a/src/main/java/se/su/dsv/scipro/workerthreads/CheckPlagiarismEventWorker.java
+++ b/src/main/java/se/su/dsv/scipro/workerthreads/CheckPlagiarismEventWorker.java
@@ -52,7 +52,7 @@ public class CheckPlagiarismEventWorker extends AbstractWorker {
checkPlagiarismEventDao.delete(cpe);
String turnitinId = turnitinComponent.quickSubmitPaper(fd, fd.getName(), uploader.getFirstName(), uploader.getLastName(), seminar.getProject().getTitle(20));
seminar.setTurnitinId(turnitinId);
- finalSeminarDao.save(seminar);
+ seminar = finalSeminarDao.save(seminar);
this.commitTransaction();
}