Mercurial > hg > ismi-richfaces
changeset 99:d0fb989bf53a
better logging of entity deletion.
author | casties |
---|---|
date | Fri, 28 Oct 2016 19:56:44 +0200 |
parents | 9b02c9af49b0 |
children | e43d5179d47f |
files | src/main/java/de/mpiwg/itgroup/ismi/browse/EntityDetailsBean.java src/main/java/de/mpiwg/itgroup/ismi/merge/GeneralMerge.java |
diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/browse/EntityDetailsBean.java Fri Oct 28 19:06:21 2016 +0200 +++ b/src/main/java/de/mpiwg/itgroup/ismi/browse/EntityDetailsBean.java Fri Oct 28 19:56:44 2016 +0200 @@ -18,7 +18,7 @@ import de.mpiwg.itgroup.ismi.event.beans.StudyEvent; import de.mpiwg.itgroup.ismi.event.beans.TransferEvent; -public class EntityDetailsBean extends AbstractBrowse{ +public class EntityDetailsBean extends AbstractBrowse { private static final long serialVersionUID = 1374652791403248103L; @@ -165,8 +165,10 @@ public String listenerDeleteEntity(){ try { - getWrapper().removeCurrentVersionEntity(this.entity); EntityRepositoryBean bean = (EntityRepositoryBean)getSessionBean("EntityRepository"); + String user = bean.getUserName(); + // delete entity + getWrapper().removeCurrentVersionEntity(this.entity, user); if(bean != null){ bean.reset(); }
--- a/src/main/java/de/mpiwg/itgroup/ismi/merge/GeneralMerge.java Fri Oct 28 19:06:21 2016 +0200 +++ b/src/main/java/de/mpiwg/itgroup/ismi/merge/GeneralMerge.java Fri Oct 28 19:56:44 2016 +0200 @@ -213,10 +213,12 @@ this.printMergeInfo(entResult); - this.getWrapper().saveEntity(this.entResult, getSessionUser().getEmail() + "_merge"); - - this.getWrapper().removeCurrentVersionEntity(this.firstEntity); - this.getWrapper().removeCurrentVersionEntity(this.secondEntity); + String user = getSessionUser().getEmail() + "_merge"; + // save new entity + this.getWrapper().saveEntity(this.entResult, user); + // remove old entities + this.getWrapper().removeCurrentVersionEntity(this.firstEntity, user); + this.getWrapper().removeCurrentVersionEntity(this.secondEntity, user); //the old relations should be removed, before... this.updateRelatedOW(this.entResult, getSessionUser().getEmail() + "_merge");