Index: trunk/grails-app/services/com/lemans/ds/media/MediaService.groovy =================================================================== diff -u -r9899 -r9949 --- trunk/grails-app/services/com/lemans/ds/media/MediaService.groovy (.../MediaService.groovy) (revision 9899) +++ trunk/grails-app/services/com/lemans/ds/media/MediaService.groovy (.../MediaService.groovy) (revision 9949) @@ -58,7 +58,7 @@ if (criteria.originalFileName) { originalFileName criteria.originalFileName } if (criteria.description) { description removeWildCards(criteria.description) } if (criteria.unassociated) { unassociated criteria.unassociated } - if (criteria.mediaArchiveFlag) { mediaArchiveFlag criteria.mediaArchiveFlag } + if (criteria.flagId) { flagId criteria.flagId } if (criteria.productId) { productId criteria.productId } if (criteria.partNumber) { partNumber criteria.partNumber } } Index: trunk/src/integration-test/groovy/com/lemans/ds/media/MediaFuncSpec.groovy =================================================================== diff -u -r9935 -r9949 --- trunk/src/integration-test/groovy/com/lemans/ds/media/MediaFuncSpec.groovy (.../MediaFuncSpec.groovy) (revision 9935) +++ trunk/src/integration-test/groovy/com/lemans/ds/media/MediaFuncSpec.groovy (.../MediaFuncSpec.groovy) (revision 9949) @@ -235,7 +235,7 @@ def 'can find media with flag archived'() { given: - queryParams.flagId = 23 + queryParams.flagId = "!23" path() ok() Index: trunk/grails-app/controllers/com/lemans/ds/media/MediaController.groovy =================================================================== diff -u -r9935 -r9949 --- trunk/grails-app/controllers/com/lemans/ds/media/MediaController.groovy (.../MediaController.groovy) (revision 9935) +++ trunk/grails-app/controllers/com/lemans/ds/media/MediaController.groovy (.../MediaController.groovy) (revision 9949) @@ -25,10 +25,8 @@ 'productId', 'partNumber', 'mediaClassificationId', - 'mediaArchiveFlag' + 'flagId' ]) - //TODO: This is a temporary fix for flagId. - if (params.flagId) { criteria.mediaArchiveFlag = 1 } List errors = [] Integer pageSize = criteria.pageSize if (!pageSize) { errors << 'pageSize is required' }