Opraveny chyby v agendě Střediska/komise.

refs #97
This commit is contained in:
2014-07-08 09:09:55 +02:00
parent 8c204e0d7a
commit 7519f4d04b
3 changed files with 8 additions and 3 deletions
@@ -40,7 +40,12 @@ public abstract class BaseDaoJPA<T> implements BaseDao<T> {
@Override
public void delete(T entity) {
sessionFactory.getCurrentSession().delete(entity);
try {
sessionFactory.getCurrentSession().delete(entity);
} catch (NonUniqueObjectException e) {
Object o = sessionFactory.getCurrentSession().merge(entity);
sessionFactory.getCurrentSession().delete(o);
}
}
@Override
@@ -124,7 +124,7 @@ public class WorkgroupForm extends FormViewModel<Workgroup> {
return;
}
getDataBean().removeMember(u);
workgroupService.removeMember(getDataBean(), u);
if (!target.equals("users")) {
moveUser(u.getMember(), event);