Revision aed50618
Added by Andreas Müller almost 4 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/container/LeafNodeTaxonContainer.java | ||
---|---|---|
30 | 30 |
import com.vaadin.data.util.sqlcontainer.RowItem; |
31 | 31 |
|
32 | 32 |
import eu.etaxonomy.cdm.model.name.Rank; |
33 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus; |
|
33 | 34 |
import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory; |
34 | 35 |
|
35 | 36 |
/** |
... | ... | |
84 | 85 |
|
85 | 86 |
private void initFilters() { |
86 | 87 |
//nrFilter = new Compare.Equal(StatusPresenter.UNR_ID, true); |
87 |
unpFilter = new Compare.Equal("tn.unplaced", true);
|
|
88 |
unpFilter = new Compare.Equal("tn.status", TaxonNodeStatus.UNPLACED.getKey());
|
|
88 | 89 |
//unfFilter = new Compare.Equal(StatusPresenter.FN_ID, false); |
89 | 90 |
unpbFilter = new Compare.Equal("tb.publish", false); |
90 | 91 |
classificationFilter = new Compare.Equal("tn.classification_id", classificationId); |
src/main/java/eu/etaxonomy/cdm/vaadin/util/CdmQueryFactory.java | ||
---|---|---|
24 | 24 |
import eu.etaxonomy.cdm.common.CdmUtils; |
25 | 25 |
import eu.etaxonomy.cdm.model.common.Language; |
26 | 26 |
import eu.etaxonomy.cdm.model.location.NamedArea; |
27 |
import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus; |
|
27 | 28 |
import eu.etaxonomy.cdm.model.term.Representation; |
28 | 29 |
import eu.etaxonomy.cdm.vaadin.statement.CdmStatementDelegate; |
29 | 30 |
|
... | ... | |
74 | 75 |
", tb.uuid as " + UUID_ID + |
75 | 76 |
", n.titleCache as " + name_id + |
76 | 77 |
", tb.publish as " + pb_id + |
77 |
", tn.status ='UNP' as " + unp_id +
|
|
78 |
", tn.status ='"+TaxonNodeStatus.UNPLACED.getKey()+"' as " + unp_id + //this may be incorrectly fixed
|
|
78 | 79 |
", dtb.titleCache as " + rank_id + |
79 | 80 |
", (SELECT COUNT(*) FROM TaxonBase syn WHERE tb.id = syn.acceptedTaxon_id) as " + has_syn_id + |
80 | 81 |
FROM_QUERY; |
Also available in: Unified diff
ref #9005 try to fix unplaced in CdmQueryFactory and LeafNodeTaxonContainer