Changeset 216 for trunk/grails-app/controllers

Timestamp:

Dec 4, 2009, 2:05:27 PM (14 years ago)

Author:

gav

Message:

Replace personService.currentUser() with the more groovy personService.getCurrentUser() so that personService.currentUser can be called.

Location:

trunk/grails-app/controllers

Files:

• AppCoreController.groovy (modified) (3 diffs)
• EntryDetailedController.groovy (modified) (3 diffs)
• TaskDetailedController.groovy (modified) (4 diffs)

trunk/grails-app/controllers/AppCoreController.groovy

@@ -17 +17 @@
     */
     def welcome = {
-        def personInstance = personService.currentUser()
+        def personInstance = personService.currentUser
         flash.message = "Welcome, ${personInstance.firstName} ${personInstance.lastName}."
 
@@ -30 +30 @@
     def changeSessionTimeout = {
         if (request.method == 'GET') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
             return [ personInstance : personInstance ]       
         }
         if (request.method == 'POST') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
                 personInstance.properties = params
                 if (!personInstance.hasErrors() && personInstance.save(flush: true)) {
@@ -53 +53 @@
 
         if (request.method == 'GET') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
             return [ personInstance : personInstance ]       
         }
 
         if (request.method == 'POST') {
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.confirmPass == params.pass) {

trunk/grails-app/controllers/EntryDetailedController.groovy

@@ -29 +29 @@
         def entryInstance = Entry.get( params.id )
         if(entryInstance) {
-            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
+            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
                 def taskID = entryInstance.task.id
                 entryInstance.delete(flush:true)
@@ -55 +55 @@
         else {
 
-            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
+            if(entryInstance.enteredBy.loginName == personService.currentUser.loginName) {
                 return [ entryInstance : entryInstance ]
             }
@@ -70 +70 @@
         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 == personService.currentUser.loginName) {
                 entryInstance.properties = params
                 if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {

trunk/grails-app/controllers/TaskDetailedController.groovy

@@ -28 +28 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.quickSearch == "searchMyTodays") {
@@ -67 +67 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.quickSearch == "searchMyTodays") {
@@ -112 +112 @@
         if(!FilterUtils.isFilterApplied(params)) {
             def taskInstanceList = []
-            def personInstance = personService.currentUser()
+            def personInstance = personService.currentUser
 
             if(params.quickSearch == "budgetUnplanned") {
@@ -416 +416 @@
 
         // Default leadPerson to current user, unless supplied in params.
-        taskInstance.leadPerson = personService.currentUser()
+        taskInstance.leadPerson = personService.currentUser
         taskInstance.properties = params
         return ['taskInstance': taskInstance]