From c96875dd0b7da51946c1ba74989e6e019c7a5a26 Mon Sep 17 00:00:00 2001
From: Fredrik Friis <fred-fri@dsv.su.se>
Date: Thu, 1 Mar 2012 12:01:26 +0900
Subject: [PATCH] fixed some saves

---
 .../se/su/dsv/scipro/admin/pages/AdminProjectPartnerPage.java   | 2 +-
 .../dsv/scipro/admin/pages/match/AdminExemptionCreatePanel.java | 2 +-
 .../se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/AdminProjectPartnerPage.java b/src/main/java/se/su/dsv/scipro/admin/pages/AdminProjectPartnerPage.java
index d3ac167610..04fff1229b 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/AdminProjectPartnerPage.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/AdminProjectPartnerPage.java
@@ -46,7 +46,7 @@ public class AdminProjectPartnerPage extends AbstractAdminPage {
 			@Override
 			public void onSubmit() {
 				settings.setProjectPartnerDaysToLive(amountOfDays);
-				generalSystemSettingsDao.save(settings);
+				settings = generalSystemSettingsDao.save(settings);
 				info("OK");
 			}
 		});
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionCreatePanel.java b/src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionCreatePanel.java
index 267decc14b..43d0964362 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionCreatePanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/match/AdminExemptionCreatePanel.java
@@ -68,7 +68,7 @@ public class AdminExemptionCreatePanel extends Panel {
             exemption.setGrantedBy(SciProSession.get().getUser());
             exemption.setAuthor(authorDao.getOrCreate(studentSelector.getModelObject().getUser()));
             try {
-                exemptionDao.save(exemption);
+                exemption = exemptionDao.save(exemption);
                 info("Exemption created.");
             } catch (DataIntegrityViolationException e) {
                 error("Only one exemption per author and project class allowed.");
diff --git a/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java b/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java
index 46fa4e3a85..ae2872b405 100644
--- a/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/pages/match/AutomaticMatchPanel.java
@@ -63,7 +63,7 @@ public class AutomaticMatchPanel extends Panel {
                             for (Match match : result.matches) {
                                 match.setCreatedBy(SciProSession.get().getUser());
                                 match.setStatus(Match.Status.PUBLISHED);
-                                matchDao.save(match);
+                                match = matchDao.save(match);
                             } 
                             info("Saved " + result.matches.size() + " matches");
                         } catch (Exception e) {