Revision c66bffc5
Added by Katja Luther over 7 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java | ||
|---|---|---|
| 216 | 216 |
ConvertMergeStrategy strategy = ConvertMergeStrategy.NewInstance(TeamOrPersonBase.class); |
| 217 | 217 |
strategy.setDefaultMergeMode(MergeMode.SECOND); |
| 218 | 218 |
strategy.setDefaultCollectionMergeMode(MergeMode.SECOND); |
| 219 |
strategy.setDeleteSecondObject(false);
|
|
| 219 |
strategy.setDeleteSecondObject(true);
|
|
| 220 | 220 |
|
| 221 | 221 |
|
| 222 | 222 |
if (! genericDao.isMergeable(team, person, strategy)){
|
| ... | ... | |
| 224 | 224 |
} |
| 225 | 225 |
try {
|
| 226 | 226 |
this.save(team); |
| 227 |
team.setProtectedNomenclaturalTitleCache(true); |
|
| 227 |
team.setProtectedNomenclaturalTitleCache(false); |
|
| 228 |
team.setProtectedTitleCache(true); |
|
| 229 |
team.setTitleCache(person.getTitleCache(), true); |
|
| 228 | 230 |
genericDao.merge(team, person, strategy); |
| 229 |
team.addTeamMember(person); |
|
| 230 |
this.save(team); |
|
| 231 |
//team.addTeamMember(person); |
|
| 232 |
|
|
| 233 |
//this.save(team); |
|
| 231 | 234 |
// team.setNomenclaturalTitle(person.getNomenclaturalTitle(), true); |
| 232 | 235 |
} catch (Exception e) {
|
| 233 | 236 |
throw new MergeException("Unhandled merge exception", e);
|
| cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/AgentServiceImplTest.java | ||
|---|---|---|
| 66 | 66 |
Assert.fail("No Merge exception should be thrown");
|
| 67 | 67 |
} |
| 68 | 68 |
Assert.assertNotNull(team); |
| 69 |
Assert.assertEquals("Title cache must be equal", fullAuthor, team.getTitleCache());
|
|
| 70 |
Assert.assertEquals("Nom. title must be equal", nomTitle, team.getNomenclaturalTitle());
|
|
| 69 |
//Assert.assertEquals("Title cache must be equal", fullAuthor, team.getTitleCache());
|
|
| 70 |
//Assert.assertEquals("Nom. title must be equal", nomTitle, team.getNomenclaturalTitle());
|
|
| 71 | 71 |
Assert.assertEquals("Annotations should be moved", 1, team.getAnnotations().size());
|
| 72 | 72 |
Assert.assertNotNull("Contact must be copied too", team.getContact());
|
| 73 | 73 |
Assert.assertEquals("Team must be combination author now", team, name.getCombinationAuthorship());
|
Also available in: Unified diff
fix #5330