Revision 56432bdd
Added by Andreas Kohlbecker over 5 years ago
src/main/java/eu/etaxonomy/cdm/service/RegistrationWorkingSetService.java | ||
---|---|---|
35 | 35 |
import eu.etaxonomy.cdm.model.name.RegistrationStatus; |
36 | 36 |
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation; |
37 | 37 |
import eu.etaxonomy.cdm.model.name.TypeDesignationBase; |
38 |
import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase; |
|
38 | 39 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
39 | 40 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit; |
40 | 41 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
... | ... | |
177 | 178 |
@Override |
178 | 179 |
public Pager<RegistrationDTO> pageDTOs(Integer pageSize, Integer pageIndex) { |
179 | 180 |
|
180 |
return pageDTOs(null, null, null, null, pageSize, pageIndex); |
|
181 |
return pageDTOs(null, null, null, null, null, pageSize, pageIndex);
|
|
181 | 182 |
} |
182 | 183 |
|
183 | 184 |
/** |
... | ... | |
185 | 186 |
*/ |
186 | 187 |
@Override |
187 | 188 |
public Pager<RegistrationDTO> pageDTOs(User submitter, Collection<RegistrationStatus> includedStatus, |
188 |
String identifierFilterPattern, String taxonNameFilterPattern, |
|
189 |
String identifierFilterPattern, String taxonNameFilterPattern, Set<TypeDesignationStatusBase> typeStatusFilter,
|
|
189 | 190 |
Integer pageSize, Integer pageIndex) { |
190 | 191 |
|
191 | 192 |
if(pageSize == null){ |
... | ... | |
195 | 196 |
List<OrderHint> orderHints = Arrays.asList(new OrderHint("identifier", SortOrder.ASCENDING)); |
196 | 197 |
|
197 | 198 |
Pager<Registration> pager = repo.getRegistrationService().page(submitter, includedStatus, identifierFilterPattern, taxonNameFilterPattern, |
198 |
PAGE_SIZE, pageIndex, orderHints , REGISTRATION_INIT_STRATEGY);
|
|
199 |
typeStatusFilter, PAGE_SIZE, pageIndex , orderHints, REGISTRATION_INIT_STRATEGY);
|
|
199 | 200 |
List<Registration> registrations = pager.getRecords(); |
200 | 201 |
Pager<RegistrationDTO> dtoPager = new DefaultPagerImpl(pager.getCurrentIndex(), pager.getCount(), pager.getPageSize(), makeDTOs(registrations)); |
201 | 202 |
if(logger.isDebugEnabled()){ |
Also available in: Unified diff
fix #7533 typeStatus filter for registration list view