Index: trunk/grails-app/conf/Config.groovy =================================================================== --- trunk/grails-app/conf/Config.groovy (revision 290) +++ trunk/grails-app/conf/Config.groovy (revision 291) @@ -86,5 +86,5 @@ error "grails.app" // Set the default log level for our app code. info "grails.app.bootstrap" // Set the log level per type and per type.class - error "grails.app.service.PersonService" + error "grails.app.service.AuthService" error "grails.app.service.NavigationService" error "grails.app.service.com.zeddware.grails.plugins.filterpane.FilterService" Index: trunk/grails-app/controllers/AppCoreController.groovy =================================================================== --- trunk/grails-app/controllers/AppCoreController.groovy (revision 290) +++ trunk/grails-app/controllers/AppCoreController.groovy (revision 291) @@ -6,5 +6,5 @@ class AppCoreController extends BaseController { - def personService + def authService def appConfigService def createDataService @@ -22,5 +22,5 @@ */ def welcome = { - def personInstance = personService.currentUser + def personInstance = authService.currentUser flash.message = "Welcome, ${personInstance.firstName} ${personInstance.lastName}." @@ -41,9 +41,9 @@ def changeSessionTimeout = { if (request.method == 'GET') { - def personInstance = personService.currentUser + def personInstance = authService.currentUser return [ personInstance : personInstance ] } if (request.method == 'POST') { - def personInstance = personService.currentUser + def personInstance = authService.currentUser personInstance.properties = params if (!personInstance.hasErrors() && personInstance.save(flush: true)) { @@ -67,10 +67,10 @@ if (request.method == 'GET') { - def personInstance = personService.currentUser + def personInstance = authService.currentUser return [ personInstance : personInstance ] } if (request.method == 'POST') { - def personInstance = personService.currentUser + def personInstance = authService.currentUser if(params.confirmPass == params.pass) { Index: trunk/grails-app/controllers/EntryDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/EntryDetailedController.groovy (revision 290) +++ trunk/grails-app/controllers/EntryDetailedController.groovy (revision 291) @@ -3,5 +3,5 @@ class EntryDetailedController extends BaseController { - def personService + def authService def taskService @@ -29,5 +29,5 @@ def entryInstance = Entry.get( params.id ) if(entryInstance) { - if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) { + if(entryInstance.enteredBy.loginName == authService.currentUser.loginName) { def taskID = entryInstance.task.id entryInstance.delete(flush:true) @@ -55,5 +55,5 @@ else { - if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) { + if(entryInstance.enteredBy.loginName == authService.currentUser.loginName) { return [ entryInstance : entryInstance ] } @@ -70,5 +70,5 @@ if(entryInstance) { // The update method only accepts post requests, so this is just in case. - if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) { + if(entryInstance.enteredBy.loginName == authService.currentUser.loginName) { entryInstance.properties = params if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) { Index: trunk/grails-app/controllers/TaskDetailedController.groovy =================================================================== --- trunk/grails-app/controllers/TaskDetailedController.groovy (revision 290) +++ trunk/grails-app/controllers/TaskDetailedController.groovy (revision 291) @@ -5,5 +5,5 @@ class TaskDetailedController extends BaseController { - def personService + def authService def taskService def taskSearchService @@ -45,5 +45,5 @@ def taskInstanceTotal def filterParams = [:] - def personInstance = personService.currentUser + def personInstance = authService.currentUser // Quick Search: @@ -125,5 +125,5 @@ if(!FilterUtils.isFilterApplied(params)) { def taskInstanceList = [] - def personInstance = personService.currentUser + def personInstance = authService.currentUser if(params.quickSearch == "searchMyTodays") { @@ -170,5 +170,5 @@ if(!FilterUtils.isFilterApplied(params)) { def taskInstanceList = [] - def personInstance = personService.currentUser + def personInstance = authService.currentUser if(params.quickSearch == "budgetUnplanned") { @@ -501,5 +501,5 @@ // Default leadPerson to current user, unless supplied in params. - taskInstance.leadPerson = personService.currentUser + taskInstance.leadPerson = authService.currentUser taskInstance.properties = params return ['taskInstance': taskInstance] Index: trunk/grails-app/services/AssignedGroupService.groovy =================================================================== --- trunk/grails-app/services/AssignedGroupService.groovy (revision 290) +++ trunk/grails-app/services/AssignedGroupService.groovy (revision 291) @@ -3,5 +3,5 @@ boolean transactional = false - def personService + def authService def delete(params) { @@ -22,5 +22,5 @@ return fail(code:"default.not.found") - def taskModification = new TaskModification(person: personService.currentUser, + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(10), task: result.assignedGroupInstance.task) @@ -95,5 +95,5 @@ return fail(code:"default.update.failure") - def taskModification = new TaskModification(person: personService.currentUser, + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(10), task: result.assignedGroupInstance.task) @@ -155,6 +155,6 @@ // Record a taskModification for everyone except "system". - if(personService.currentUser.id != 1) { - def taskModification = new TaskModification(person: personService.currentUser, + if(authService.currentUser.id != 1) { + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(10), task: result.assignedGroupInstance.task) Index: trunk/grails-app/services/AssignedPersonService.groovy =================================================================== --- trunk/grails-app/services/AssignedPersonService.groovy (revision 290) +++ trunk/grails-app/services/AssignedPersonService.groovy (revision 291) @@ -3,5 +3,5 @@ boolean transactional = false - def personService + def authService def delete(params) { @@ -22,5 +22,5 @@ return fail(code:"default.not.found") - def taskModification = new TaskModification(person: personService.currentUser, + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(11), task: result.assignedPersonInstance.task) @@ -95,5 +95,5 @@ return fail(code:"default.update.failure") - def taskModification = new TaskModification(person: personService.currentUser, + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(11), task: result.assignedPersonInstance.task) @@ -155,6 +155,6 @@ // Record a taskModification for every one except "system". - if(personService.currentUser.id != 1) { - def taskModification = new TaskModification(person: personService.currentUser, + if(authService.currentUser.id != 1) { + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(11), task: result.assignedPersonInstance.task) Index: trunk/grails-app/services/AuthService.groovy =================================================================== --- trunk/grails-app/services/AuthService.groovy (revision 291) +++ trunk/grails-app/services/AuthService.groovy (revision 291) @@ -0,0 +1,34 @@ +/** + * Provides a service class with some methods that integrate the Person domain class and Acegi security. + * + */ +class AuthService { + + boolean transactional = false + + def authenticateService + + /** + * Get the current user in a safe way to avoid a null userDomain. + * @returns The current user or the 'system' person (Person #1) if userDomain() is not active. + */ + def getCurrentUser() { + if(authenticateService.userDomain()) { + return Person.get(authenticateService.userDomain().id) + } + else { + log.warn "userDomain not active, attempting to return Person #1." + return Person.get(1) + } + } + + /** + * Convenience wrapper around authenticateService.encodePassword(). + * @param passClearText The clear text password to encode. + * @returns The encoded password. + */ + def encodePassword(passClearText) { + authenticateService.encodePassword(passClearText) + } + +} Index: trunk/grails-app/services/CreateBulkDataService.groovy =================================================================== --- trunk/grails-app/services/CreateBulkDataService.groovy (revision 290) +++ trunk/grails-app/services/CreateBulkDataService.groovy (revision 291) @@ -8,5 +8,5 @@ boolean transactional = false - def personService + def authService def taskService def dateUtilService @@ -83,5 +83,5 @@ //Person def passClearText = "pass" - def passwordEncoded = personService.encodePassword(passClearText) + def passwordEncoded = authService.encodePassword(passClearText) def personInstance Index: trunk/grails-app/services/CreateDataService.groovy =================================================================== --- trunk/grails-app/services/CreateDataService.groovy (revision 290) +++ trunk/grails-app/services/CreateDataService.groovy (revision 291) @@ -9,5 +9,5 @@ boolean transactional = false - def personService + def authService def taskService def dateUtilService @@ -194,5 +194,5 @@ //Person def passClearText = "pass" - def passwordEncoded = personService.encodePassword(passClearText) + def passwordEncoded = authService.encodePassword(passClearText) def personInstance @@ -212,5 +212,5 @@ //Person def passClearText = "pass" - def passwordEncoded = personService.encodePassword(passClearText) + def passwordEncoded = authService.encodePassword(passClearText) def personInstance @@ -234,5 +234,5 @@ //Person def passClearText = "pass" - def passwordEncoded = personService.encodePassword(passClearText) + def passwordEncoded = authService.encodePassword(passClearText) def personInstance Index: trunk/grails-app/services/InventoryMovementService.groovy =================================================================== --- trunk/grails-app/services/InventoryMovementService.groovy (revision 290) +++ trunk/grails-app/services/InventoryMovementService.groovy (revision 291) @@ -3,5 +3,5 @@ boolean transactional = false - def personService + def authService def reverseMove(params) { @@ -88,5 +88,5 @@ result.inventoryMovementInstance = new InventoryMovement(params) - result.inventoryMovementInstance.person = personService.currentUser + result.inventoryMovementInstance.person = authService.currentUser // Used type must have a task that is not complete or in the trash Index: trunk/grails-app/services/PersonService.groovy =================================================================== --- trunk/grails-app/services/PersonService.groovy (revision 290) +++ (revision ) @@ -1,34 +1,0 @@ -/** - * Provides a service class with some methods that integrate the Person domain class and Acegi security. - * - */ -class PersonService { - - boolean transactional = false - - def authenticateService - - /** - * Get the current user in a safe way to avoid a null userDomain. - * @returns The current user or the 'system' person (Person #1) if userDomain() is not active. - */ - def getCurrentUser() { - if(authenticateService.userDomain()) { - return Person.get(authenticateService.userDomain().id) - } - else { - log.warn "userDomain not active, attempting to return Person #1." - return Person.get(1) - } - } - - /** - * Convenience wrapper around authenticateService.encodePassword(). - * @param passClearText The clear text password to encode. - * @returns The encoded password. - */ - def encodePassword(passClearText) { - authenticateService.encodePassword(passClearText) - } - -} Index: trunk/grails-app/services/TaskService.groovy =================================================================== --- trunk/grails-app/services/TaskService.groovy (revision 290) +++ trunk/grails-app/services/TaskService.groovy (revision 291) @@ -7,5 +7,5 @@ boolean transactional = false - def personService + def authService def assignedGroupService def assignedPersonService @@ -56,5 +56,5 @@ if(taskInstance.save()) { - def taskModification = new TaskModification(person: personService.currentUser, + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(1), task: taskInstance) @@ -183,5 +183,5 @@ def result = [:] result.entryInstance = new Entry(params) - result.entryInstance.enteredBy = personService.currentUser + result.entryInstance.enteredBy = authService.currentUser if(result.entryInstance.validate()) { @@ -207,5 +207,5 @@ // Create the "Started" task modification, this provides the "Actual started date". - def taskModification = new TaskModification(person: personService.currentUser, + def taskModification = new TaskModification(person: authService.currentUser, taskModificationType: TaskModificationType.get(2), task: taskInstance) @@ -279,5 +279,5 @@ return fail() - def taskModification = new TaskModification(person:personService.currentUser, + def taskModification = new TaskModification(person:authService.currentUser, taskModificationType: TaskModificationType.get(3), task: result.taskInstance) @@ -318,5 +318,5 @@ if(result.taskInstance.save()) { - def taskModification = new TaskModification(person:personService.currentUser, + def taskModification = new TaskModification(person:authService.currentUser, taskModificationType: TaskModificationType.get(4), task: result.taskInstance) @@ -367,5 +367,5 @@ if(result.taskInstance.save()) { - def taskModification = new TaskModification(person:personService.currentUser, + def taskModification = new TaskModification(person:authService.currentUser, taskModificationType: TaskModificationType.get(5), task: result.taskInstance) @@ -416,5 +416,5 @@ if(result.taskInstance.save()) { - def taskModification = new TaskModification(person:personService.currentUser, + def taskModification = new TaskModification(person:authService.currentUser, taskModificationType: TaskModificationType.get(6), task: result.taskInstance) @@ -464,5 +464,5 @@ if(result.taskInstance.save()) { - def taskModification = new TaskModification(person:personService.currentUser, + def taskModification = new TaskModification(person:authService.currentUser, taskModificationType: TaskModificationType.get(7), task: result.taskInstance) @@ -512,5 +512,5 @@ if(result.taskInstance.save()) { - def taskModification = new TaskModification(person:personService.currentUser, + def taskModification = new TaskModification(person:authService.currentUser, taskModificationType: TaskModificationType.get(8), task: result.taskInstance) @@ -560,5 +560,5 @@ if(result.taskInstance.save()) { - def taskModification = new TaskModification(person:personService.currentUser, + def taskModification = new TaskModification(person:authService.currentUser, taskModificationType: TaskModificationType.get(9), task: result.taskInstance)