Revision 10cc0e5e
Added by Cherian Mathew almost 9 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/container/LeafNodeTaxonContainer.java | ||
|---|---|---|
| 30 | 30 |
import com.vaadin.data.util.sqlcontainer.RowId; |
| 31 | 31 |
import com.vaadin.data.util.sqlcontainer.RowItem; |
| 32 | 32 |
|
| 33 |
import eu.etaxonomy.cdm.model.name.Rank; |
|
| 33 | 34 |
import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory; |
| 34 | 35 |
|
| 35 | 36 |
/** |
| ... | ... | |
| 79 | 80 |
initFilters(); |
| 80 | 81 |
addContainerFilter(classificationFilter); |
| 81 | 82 |
enableCacheFlushNotifications(); |
| 82 |
//addContainerFilter(rankFilter);
|
|
| 83 |
addContainerFilter(rankFilter); |
|
| 83 | 84 |
} |
| 84 | 85 |
|
| 85 | 86 |
private void initFilters() {
|
| ... | ... | |
| 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);
|
| 91 |
rankFilter = new Compare.Equal("dtb.titleCache","Species");
|
|
| 92 |
|
|
| 93 |
// get species aggregate rank order index |
|
| 94 |
int saoIndex = Rank.SPECIESAGGREGATE().getOrderIndex(); |
|
| 95 |
rankFilter = new Compare.GreaterOrEqual("dtb.orderindex", saoIndex);
|
|
| 96 |
|
|
| 92 | 97 |
synonymFilter = new Not(new IsNull("sr.relatedto_id"));
|
| 93 | 98 |
|
| 94 | 99 |
currentFilters = new HashSet<Filter>(); |
Also available in: Unified diff
NewTaxonBaseComposite : add exception handling when name already exists
StatusComposite : added tab sheet with main / excluded tabs
CdmQueryFactory, LeafNodeTaxonContainer : added rank filter for ranks below species aggregate
NewTaxonBasePresenter : added check if name exists
NewTaxonBasePresenterTest (.xml) : corrected data for valid names and added test for name check
CdmVaadinOperation : added method to set exception