Index: trunk/grails-app/services/com/lemans/ds/publicationcategory/ProductPublicationCategoryService.groovy =================================================================== diff -u -r9771 -r9965 --- trunk/grails-app/services/com/lemans/ds/publicationcategory/ProductPublicationCategoryService.groovy (.../ProductPublicationCategoryService.groovy) (revision 9771) +++ trunk/grails-app/services/com/lemans/ds/publicationcategory/ProductPublicationCategoryService.groovy (.../ProductPublicationCategoryService.groovy) (revision 9965) @@ -9,12 +9,12 @@ /** * Find all ProductPublicationCategories by categoryId * - * @param categoryId + * @param criteria * * @return ProductPublicationCategories data */ - Map productPublicationCategoriesByCategoryId(Integer categoryId) { - dqx([categoryId: categoryId]).executeFrom('vwProductPublicationCategory', ['categoryId = :categoryId']) + Map productPublicationCategoriesByCategoryId(Map criteria) { + dqx(criteria).executeFrom('vwProductPublicationCategory', ['categoryId = :categoryId']) } /** @@ -31,12 +31,12 @@ /** * Find productPublicationCategories by productId * - * @param productId + * @param criteria * * @return ProductPublicationCategories data */ - Map productPublicationCategoriesByProductId(Integer productId) { - dqx([productId: productId]).executeFrom('vwProductPublicationCategory', ['productId = :productId']) + Map productPublicationCategoriesByProductId(Map criteria) { + dqx(criteria).executeFrom('vwProductPublicationCategory', ['productId = :productId']) } ProductPublicationCategory findProductPublicationCategory(Integer categoryId, Integer productId) { Index: trunk/grails-app/controllers/com/lemans/ds/publicationcategory/ProductPublicationCategoryController.groovy =================================================================== diff -u -r9771 -r9965 --- trunk/grails-app/controllers/com/lemans/ds/publicationcategory/ProductPublicationCategoryController.groovy (.../ProductPublicationCategoryController.groovy) (revision 9771) +++ trunk/grails-app/controllers/com/lemans/ds/publicationcategory/ProductPublicationCategoryController.groovy (.../ProductPublicationCategoryController.groovy) (revision 9965) @@ -9,15 +9,17 @@ def productPublicationCategoryManagerService def byCategoryId(Integer categoryId) { - renderPaginated productPublicationCategoryService.productPublicationCategoriesByCategoryId(categoryId) + Map criteria = common() + pagination() + [categoryId: categoryId] + renderPaginated productPublicationCategoryService.productPublicationCategoriesByCategoryId(criteria) } def show(Integer productPublicationCategoryId) { renderOne productPublicationCategoryService.productPublicationCategory(productPublicationCategoryId) } def byProductId(Integer productId) { - renderPaginated productPublicationCategoryService.productPublicationCategoriesByProductId(productId) + Map criteria = common() + pagination() + [productId: productId] + renderPaginated productPublicationCategoryService.productPublicationCategoriesByProductId(criteria) } def add(Integer categoryId) {