Project

General

Profile

« Previous | Next » 

Revision 9bb42d8a

Added by Patrick Plitzner over 7 years ago

ref #5458 Fix node retrieval for classification

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionTablePresenter.java
31 31
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
32 32
import eu.etaxonomy.cdm.model.description.TaxonDescription;
33 33
import eu.etaxonomy.cdm.model.location.NamedArea;
34
import eu.etaxonomy.cdm.model.taxon.Classification;
34 35
import eu.etaxonomy.cdm.model.taxon.Taxon;
35 36
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
36 37
import eu.etaxonomy.cdm.vaadin.container.CdmSQLContainer;
......
212 213
		VaadinSession session = VaadinSession.getCurrent();
213 214
		List<UUID> taxonNodeUUIDs = (List<UUID>) session.getAttribute(DistributionEditorUtil.SATTR_TAXON_NODES_UUID);
214 215
		UUID classificationUuid = (UUID)session.getAttribute(DistributionEditorUtil.SATTR_CLASSIFICATION);
215
		if(taxonNodeUUIDs==null && classificationUuid!=null){
216
			taxonNodeUUIDs = Collections.singletonList(classificationUuid);
216
		if((taxonNodeUUIDs==null || taxonNodeUUIDs.isEmpty()) && classificationUuid!=null){
217
			Classification classification = classificationService.load(classificationUuid);
218
			if(classification!=null){
219
				taxonNodeUUIDs = Collections.singletonList(classification.getRootNode().getUuid());
220
			}
217 221
		}
218 222
		List<TaxonNode> loadedNodes = taxonNodeService.load(taxonNodeUUIDs, null);
219 223
		if(loadedNodes!=null){

Also available in: Unified diff