Project

General

Profile

« Previous | Next » 

Revision a48fe9eb

Added by Fabian Reimeier over 5 years ago

ref #7023 bugfix

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/util/DistributionStatusQuery.java
87 87 
        for(int i=startIndex; i<startIndex+count; i++) {
88 88 
            if(i<this.size()) {
89 89 
                UUID nodeUuid = this.nodeUuids.get(i);
90 
                final TaxonNode taxonNode = CdmSpringContextHelper.getTaxonNodeService().load(nodeUuid, Arrays.asList("taxon"));
91 
                final Taxon taxon = taxonNode.getTaxon();
90 
                TaxonNode taxonNode = CdmSpringContextHelper.getTaxonNodeService().load(nodeUuid, Arrays.asList("taxon"));
91 
                Taxon taxon = taxonNode.getTaxon();
92 92 
                Item item = new PropertysetItem();
93 93 
                item.addItemProperty(UUID_COLUMN, new ObjectProperty<>(taxon.getUuid(), UUID.class));
94 94 
                item.addItemProperty(TAXON_COLUMN, new ObjectProperty<>(taxon.getTitleCache(), String.class));
......
98 98 
                    UUID distributionStatusUuid = (distributionStatus != null) ? distributionStatus.getUuid() : null;
99 99 
                    item.addItemProperty(namedArea.getUuid(), new ObjectProperty<>(distributionStatusUuid, UUID.class));
100 100 
                }
101 
                if(definition.getFilters().parallelStream().allMatch(f -> f.passesFilter(nodeUuid, item))) {
101 
                if(definition.getFilters().parallelStream().allMatch(f -> f.passesFilter(taxon.getUuid(), item))) {
102 102 
                    items.add(item);
103 103 
                }
104 104 
            }

Also available in: Unified diff