Index: grails-app/services/com/lemans/distribution/document/DistributionDocumentService.groovy =================================================================== diff -u -r474373cde048f7512eb932637794a79c5a066c45 -rec31a5d5de00976176967abff02174ce9451aa2a --- grails-app/services/com/lemans/distribution/document/DistributionDocumentService.groovy (.../DistributionDocumentService.groovy) (revision 474373cde048f7512eb932637794a79c5a066c45) +++ grails-app/services/com/lemans/distribution/document/DistributionDocumentService.groovy (.../DistributionDocumentService.groovy) (revision ec31a5d5de00976176967abff02174ce9451aa2a) @@ -43,7 +43,7 @@ if (criteria.documentDescription) { clauses << 'documentDescription LIKE :documentDescription' } if (criteria.documentName) { clauses << 'documentName LIKE :documentName' } if (criteria.originalFileName) { clauses << 'originalFileName LIKE :originalFileName' } - if (criteria.fileName) { clauses << 'fileName LIKE :fileName' } + if (criteria.fileName) { clauses << 'originalFileName LIKE :fileName' } if (criteria.repOnly == true) { clauses << 'repOnly = 1' } if (criteria.repOnly == false) { clauses << 'repOnly = 0' } if (criteria.noStartDate) { clauses << 'startDate IS NULL' } @@ -70,7 +70,7 @@ if (criteria.documentSearch) { clauses << """documentDescription LIKE :documentSearch OR documentName LIKE :documentSearch - OR fileName LIKE :documentSearch """ + OR originalFileName LIKE :documentSearch """ } clauses } Index: grails-app/services/com/lemans/programs/ProgramManagerService.groovy =================================================================== diff -u -r8e1af8e12192639101adccb86e03d3bf5627fe67 -rec31a5d5de00976176967abff02174ce9451aa2a --- grails-app/services/com/lemans/programs/ProgramManagerService.groovy (.../ProgramManagerService.groovy) (revision 8e1af8e12192639101adccb86e03d3bf5627fe67) +++ grails-app/services/com/lemans/programs/ProgramManagerService.groovy (.../ProgramManagerService.groovy) (revision ec31a5d5de00976176967abff02174ce9451aa2a) @@ -85,8 +85,8 @@ } void validateProgramFlag(Program program) { - if (program.salesRepOnly == program.internalUseOnly) { - program.errors.rejectValue('salesRepOnly', 'salesRepOnly.boolean',"Both salesRepOnly & internalUseOnly cannot be $program.salesRepOnly") + if ((program.salesRepOnly = true) && (program.internalUseOnly = true)) { + program.errors.rejectValue('salesRepOnly', 'salesRepOnly.boolean',"Both salesRepOnly & internalUseOnly flags cannot be true") } } }