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

Timestamp:

Nov 15, 2009, 1:50:18 AM (14 years ago)

Author:

gav

Message:

Add createEntry to TaskService, automgically updates the task to "In progress" and creates the "Started" task modification.

File:

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

trunk/grails-app/controllers/EntryDetailedController.groovy

@@ -4 +4 @@
 
     def personService
+    def taskService
 
     def index = { redirect(action:list,params:params) }
@@ -20 +21 @@
         if(!entryInstance) {
             flash.message = "Entry not found with id ${params.id}"
-            redirect(action:list)
+            redirect(controller: 'taskDetailed', action: 'search')
         }
         else { return [ entryInstance : entryInstance ] }
@@ -42 +43 @@
         else {
             flash.message = "Entry not found with id ${params.id}"
-            redirect(action:list)
+            redirect(controller: "taskDetailed", action:"search")
         }
     }
@@ -50 +51 @@
         if(!entryInstance) {
                 flash.message = "Entry not found with id ${params.id}"
-                redirect(action:list)
+                redirect(controller: "taskDetailed", action:"search")
         }
         else {
@@ -86 +87 @@
         else {
             flash.message = "Entry not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(controller: "taskDetailed", action:"search")
         }
     }
@@ -98 +99 @@
         }
         catch(Exception e) {
-            flash.message = "Please select a task, then 'Add Entry'"
-            redirect(controller:"taskDetailed", action:"list")
+            flash.message = "Please select a task, then 'Add Entry'."
+            redirect(controller:"taskDetailed", action:"search")
         }
     }
 
     def save = {
-        def entryInstance = new Entry(params)
+        def result = taskService.createEntry(params)
 
-        entryInstance.enteredBy = personService.currentUser()
-        if(!entryInstance.hasErrors() && entryInstance.save(flush: true)) {
-            flash.message = "Entry ${entryInstance.id} created"
-            redirect(controller:"taskDetailed", action:"show", id: params.task.id)
+        if(!result.error) {
+            flash.message = "Entry created."
+            redirect(controller: "taskDetailed", action: "show", id: result.taskId)
         }
         else {
-            render(view:'create',model:[entryInstance:entryInstance])
+            if(result.entryInstance) {
+                render(view:'create',model:[entryInstance: result.entryInstance])
+            }
+            else {
+                flash.message = "Could not create entry."
+                redirect(controller: "taskDetailed", action:"search")
+            }
+
         }
     }
+
 }