Revision bd7b2ec4
Added by Katja Luther about 7 years ago
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java | ||
---|---|---|
92 | 92 |
description.addAnnotation(annotation); |
93 | 93 |
newAcceptedTaxonNode.getTaxon().addDescription(description); |
94 | 94 |
if (CdmApplicationState.getCurrentAppConfig() instanceof CdmApplicationRemoteController) { |
95 |
CdmStore.getService(IDescriptionService.class).merge(description); |
|
95 |
CdmStore.getService(IDescriptionService.class).merge(description, true);
|
|
96 | 96 |
} else { |
97 | 97 |
CdmStore.getService(IDescriptionService.class).saveOrUpdate(description); |
98 | 98 |
} |
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java | ||
---|---|---|
240 | 240 |
TaxonNode targetNode = (TaxonNode) targetITaxonTreeNode; |
241 | 241 |
|
242 | 242 |
if(CdmStore.getCurrentSessionManager().isRemoting()) { |
243 |
AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, targetNode.getParent(), true);
|
|
243 |
AbstractOperation operation = new RemotingMoveTaxonOperation(taxonNavigator, false, uuids, targetNode, false);
|
|
244 | 244 |
NavigationUtil.executeOperation(operation, null); |
245 | 245 |
} else { |
246 | 246 |
AbstractPostOperation operation = new MoveTaxonOperation |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java | ||
---|---|---|
152 | 152 |
|
153 | 153 |
viewer.add(featureTree); |
154 | 154 |
if(CdmStore.getCurrentSessionManager().isRemoting()) { |
155 |
CdmStore.getService(IFeatureTreeService.class).merge(featureTree); |
|
155 |
CdmStore.getService(IFeatureTreeService.class).merge(featureTree, true);
|
|
156 | 156 |
} else { |
157 | 157 |
CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(featureTree); |
158 | 158 |
} |
Also available in: Unified diff
smaller changes to fix moving of taxonnodes