Project

General

Profile

« Previous | Next » 

Revision acebcf17

Added by Andreas Müller over 5 years ago

ref #3560 add includeUnpublished for loadChildNodesOfTaxonNode in TaxEditor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java
443 443

  
444 444
        }
445 445
        if (taxonNode != null) {
446
            selectedTaxonNodes = taxonNodeService.loadChildNodesOfTaxonNode(taxonNode, NODE_INIT_STRATEGY, true, null);
446
        	boolean includeUnpublished = true;
447
            selectedTaxonNodes = taxonNodeService.loadChildNodesOfTaxonNode(taxonNode, NODE_INIT_STRATEGY, true, includeUnpublished, null);
447 448
            countNodes = selectedTaxonNodes.size();
448 449
            viewer.setInput(checklistEditorInput.getTaxa());
449 450
            statusLabel.setText(ELEMENT_COUNT + (countNodes != null ? countNodes : UNKNOWN));
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/taxon/TaxonNodeComboContentProvider.java
27 27

  
28 28
    @Override
29 29
    public Object[] getElements(Object inputElement) {
30
        Collection<TaxonNode> nodes = (Collection<TaxonNode>)inputElement;
30
    	boolean includeUnpublished = true;
31
        
32
    	Collection<TaxonNode> nodes = (Collection<TaxonNode>)inputElement;
31 33
        List<TaxonNode> allNodes = new ArrayList<>();
32 34
        nodes.forEach(node->{
33 35
            allNodes.add(node);
34
            allNodes.addAll(CdmStore.getService(ITaxonNodeService.class).loadChildNodesOfTaxonNode(node, null, true, null));
36
            allNodes.addAll(CdmStore.getService(ITaxonNodeService.class).loadChildNodesOfTaxonNode(
37
            		node, null, true, includeUnpublished, null));
35 38
        });
36 39
        return allNodes.toArray();
37 40
    }

Also available in: Unified diff