# HG changeset patch
# User casties
# Date 1477677404 -7200
# Node ID d0fb989bf53ae17716d0b67f356da7de0c4ea127
# Parent  9b02c9af49b05a2f2e278e50b7e474b683beb91b
better logging of entity deletion.

diff -r 9b02c9af49b0 -r d0fb989bf53a src/main/java/de/mpiwg/itgroup/ismi/browse/EntityDetailsBean.java
--- 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();	
 			}
diff -r 9b02c9af49b0 -r d0fb989bf53a src/main/java/de/mpiwg/itgroup/ismi/merge/GeneralMerge.java
--- 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");