Project

General

Profile

« Previous | Next » 

Revision b9b58fbb

Added by Andreas Kohlbecker about 9 years ago

implementing better namedAreasInUse service for #3994 (Select widget to choose the filter areas for the advanced search)

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
42 42
import eu.etaxonomy.cdm.model.location.NamedAreaType;
43 43
import eu.etaxonomy.cdm.model.name.Rank;
44 44
import eu.etaxonomy.cdm.model.taxon.Taxon;
45
import eu.etaxonomy.cdm.persistence.dto.TermDto;
45 46
import eu.etaxonomy.cdm.persistence.query.MatchMode;
46 47
import eu.etaxonomy.cdm.persistence.query.OrderHint;
47 48
import eu.etaxonomy.cdm.remote.controller.util.PagerParameters;
......
279 280
    }
280 281

  
281 282
    @RequestMapping(value = "namedAreasInUse", method = RequestMethod.GET)
282
    public Pager<NamedArea> doPageNamedAreasInUse(
283
    public Pager<TermDto> doPageNamedAreasInUse(
284
            @RequestParam(value = "includeAllParents", required = false) boolean includeAllParents,
283 285
            @RequestParam(value = "pageSize", required = false) Integer pageSize,
284 286
            @RequestParam(value = "pageNumber", required = false) Integer pageNumber, HttpServletRequest request,
285 287
            HttpServletResponse response) throws IOException {
......
289 291
        PagerParameters pagerParams = new PagerParameters(pageSize, pageNumber);
290 292
        pagerParams.normalizeAndValidate(response);
291 293

  
292
        Pager<NamedArea> pager = service.pageNamedAreasInUse(pageSize, pageNumber, getInitializationStrategy());
294
        Pager<TermDto> pager = service.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
295

  
296
        localizeTerms(pager);
293 297

  
294 298
        return pager;
295 299
    }

Also available in: Unified diff