From fae7d159b6e00234f30e3a710444717e372deb6a Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Wed, 29 May 2013 13:41:36 +0000
Subject: [PATCH] SP-651 BIS-422 user settings are saved with a popup
SVN: 29247
---
.../cisd/openbis/generic/server/dataaccess/db/PersonDAO.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
index 84c45062d83..66888a33491 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAO.java
@@ -123,7 +123,7 @@ public final class PersonDAO extends AbstractGenericEntityDAO<PersonPE> implemen
{
person.getPersonDisplaySettings().setId(person.getId());
}
- template.update(person.getPersonDisplaySettings());
+ template.merge(person.getPersonDisplaySettings()); // cannot be update - look below
}
template.merge(person); // WORKAROUND update cannot be used - see LMS-1603
template.flush();
--
GitLab