Changeset 185 for trunk/grails-app/controllers/EntryDetailedController.groovy

Timestamp:

Nov 10, 2009, 9:56:28 PM (15 years ago)

Author:

gav

Message:

Small refactor to use personService where appropriate.

File:

• trunk/grails-app/controllers/EntryDetailedController.groovy (modified) (5 diffs)

trunk/grails-app/controllers/EntryDetailedController.groovy

@@ -3 +3 @@
 class EntryDetailedController extends BaseController {
 
-    def authenticateService
+    def personService
 
     def index = { redirect(action:list,params:params) }
@@ -28 +28 @@
         def entryInstance = Entry.get( params.id )
         if(entryInstance) {
-            if(entryInstance.enteredBy.loginName == authenticateService.userDomain().loginName) {
-                entryInstance.delete()
+            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
+                def taskID = entryInstance.task.id
+                entryInstance.delete(flush:true)
                 flash.message = "Entry ${params.id} deleted"
-                redirect(action:list)
+                redirect(controller: 'taskDetailed', action: 'show', id: taskID)
             }
             else {
@@ -53 +54 @@
         else {
 
-            if(entryInstance.enteredBy.loginName == authenticateService.userDomain().loginName) {
+            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
                 return [ entryInstance : entryInstance ]
             }
@@ -67 +68 @@
         def entryInstance = Entry.get( params.id )
         if(entryInstance) {
-            entryInstance.properties = params
-            if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {
-                flash.message = "Entry ${params.id} updated"
-                redirect(action:show,id:entryInstance.id)
+            // The update method only accepts post requests, so this is just in case.
+            if(entryInstance.enteredBy.loginName == personService.currentUser().loginName) {
+                entryInstance.properties = params
+                if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {
+                    flash.message = "Entry ${params.id} updated"
+                    redirect(action:show,id:entryInstance.id)
+                }
+                else {
+                    render(view:'edit',model:[entryInstance:entryInstance])
+                }
             }
             else {
-                render(view:'edit',model:[entryInstance:entryInstance])
+                flash.message = "You may only edit your own entries."
+                redirect(action:show,id:entryInstance.id)
             }
         }
@@ -98 +106 @@
         def entryInstance = new Entry(params)
 
-        entryInstance.enteredBy = Person.get(authenticateService.userDomain().id)
+        entryInstance.enteredBy = personService.currentUser()
         if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {
             flash.message = "Entry ${entryInstance.id} created"