Changeset 482

Timestamp:

Apr 13, 2010, 11:02:59 AM (14 years ago)

Author:

gav

Message:

Refactor entry creation to provide correct error messages when trying to create a new entry on a complete task.

Location:

trunk/grails-app

Files:

• controllers/EntryDetailedController.groovy (modified) (2 diffs)
• i18n/messages.properties (modified) (1 diff)
• services/TaskService.groovy (modified) (1 diff)
• views/entryDetailed/create.gsp (modified) (1 diff)
• views/taskDetailed/create.gsp (modified) (1 diff)

trunk/grails-app/controllers/EntryDetailedController.groovy

@@ -93 +93 @@
 
     def create = {
-        try {
-            def taskInstance = Task.get(params.taskInstance.id)
-            def entryInstance = new Entry()
-            entryInstance.task = taskInstance
-            entryInstance.entryType = EntryType.get(params.entryType.id)
-            return ['entryInstance':entryInstance]
+        if(!params.taskInstance?.id || !params.entryType?.id) {
+            flash.message = g.message(code:"entry.create.no.params")
+            redirect(controller:"taskDetailed", action:"search")
+            return
         }
-        catch(Exception e) {
-            flash.message = "Please select a task, then 'Add Entry'."
+
+        def taskInstance = Task.read(params.taskInstance.id)
+
+        if(!taskInstance) {
+            flash.message = g.message(code:"task.notFound")
             redirect(controller:"taskDetailed", action:"search")
+            return
         }
-    }
+
+        // Check for Complete task.
+        if(taskInstance.taskStatus.id == 3) {
+            flash.errorMessage = g.message(code:"task.operationNotPermittedOnCompleteTask")
+            redirect(controller:"taskDetailed", action:"show", id: taskInstance.id)
+            return
+        }
+
+        def entryInstance = new Entry()
+        entryInstance.task = taskInstance
+        entryInstance.entryType = EntryType.read(params.entryType.id)
+        return ['entryInstance': entryInstance]
+    } // create
 
     def save = {
@@ -112 +126 @@
             flash.message = "Entry created."
             redirect(controller: "taskDetailed", action: "show", id: result.taskId)
+            return
         }
-        else {
-            if(result.entryInstance) {
-                render(view:'create',model:[entryInstance: result.entryInstance])
-            }
-            else {
-                flash.message = "Could not create entry."
-                redirect(controller: "taskDetailed", action:"search")
-            }
 
+        if(result.error.code != "default.create.failure") {
+            params.errorMessage = g.message(code: result.error.code)
         }
-    }
 
-}
+        render(view:'create',model:[entryInstance: result.entryInstance])
+    } // save
+
+} // end class

trunk/grails-app/i18n/messages.properties

@@ -94 +94 @@
 task.targetCompletionDate.before.targetStartDate=The target completion date must be equal to or greater than \
     the target start date.
+
+entry.create.no.params=Please select a task, then add an entry.
 
 taskRecurringSchedule.notFound=Could not complete operation, recurring schedule not found.

trunk/grails-app/services/TaskService.groovy

@@ -273 +273 @@
             }
 
-            if(result.entryInstance.hasErrors() || !result.entryInstance.save())
-                return fail(field:"task", code:"default.create.failure")
-
-            // Success.
-            return result
-
-        } //end withTransaction
+            // Success.
+            return result
+
+        } // end withTransaction
     } // end saveEntry()
 

trunk/grails-app/views/entryDetailed/create.gsp

@@ -14 +14 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${entryInstance}">
             <div class="errors">

trunk/grails-app/views/taskDetailed/create.gsp

@@ -12 +12 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${taskInstance}">
             <div class="errors">