MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'Development' of https://gitlab.eudat.eu/dmp/OpenAIRE-EUDAT-DMP-service-pilot into Development

This commit is contained in:
apapachristou 2020-10-29 12:04:41 +02:00
parent f1cdacbe33 d77fefc7c5
commit 19b751984b
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dmp-backend/web/src/main/java/eu/eudat/logic/managers/MergeEmailConfirmationManager.java
View File

@ -90,6 +90,7 @@ public class MergeEmailConfirmationManager {
databaseRepository.getUserDmpDao().createOrUpdate(userDmp); databaseRepository.getUserDmpDao().createOrUpdate(userDmp);
}); });
oldUser.setUserStatus((short)1); oldUser.setUserStatus((short)1);
oldUser.setEmail(null);
databaseRepository.getUserInfoDao().createOrUpdate(oldUser); databaseRepository.getUserInfoDao().createOrUpdate(oldUser);
} }