Revision eb3f9882
Added by Katja Luther over 3 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java | ||
|---|---|---|
| 20 | 20 |
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; |
| 21 | 21 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus; |
| 23 |
import eu.etaxonomy.cdm.persistence.dto.MergeResult; |
|
| 24 | 23 |
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto; |
| 25 | 24 |
import eu.etaxonomy.taxeditor.l10n.Messages; |
| 26 | 25 |
import eu.etaxonomy.taxeditor.model.MessagingUtils; |
| ... | ... | |
| 78 | 77 |
|
| 79 | 78 |
if (result.isOk()){
|
| 80 | 79 |
this.setEntity((TaxonNode)result.getCdmEntity()); |
| 81 |
this.getEntity().getTaxon().setPublish(taxon.isPublish()); |
|
| 82 |
MergeResult<TaxonNode> mergeResult = CdmStore.getService(ITaxonNodeService.class).merge(this.getEntity(), true); |
|
| 83 |
this.setEntity(mergeResult.getMergedEntity()); |
|
| 84 | 80 |
CdmApplicationState.getCurrentDataChangeService() |
| 85 | 81 |
.fireChangeEvent(new CdmChangeEvent(Action.Create, result.getUpdatedObjects(), NewTaxonNodeWizard.class), true); |
| 86 |
CdmApplicationState.getCurrentDataChangeService() |
|
| 87 |
.fireChangeEvent(new CdmChangeEvent(Action.Create, mergeResult.getMergedEntity(), NewTaxonNodeWizard.class), true); |
|
| 88 | 82 |
|
| 89 | 83 |
}else{
|
| 90 | 84 |
setSuccess(false); |
Also available in: Unified diff
ref #9350: fix is implemented in cdmlib therefore we can remove the workaround in taxeditor