Changeset 873 for trunk/grails-app/controllers

Timestamp:

Mar 16, 2011, 9:50:39 AM (14 years ago)

Author:

gav

Message:

Refactor logic into TaskService.checkCreateEntry().
Prevent entry creation on recurring tasks altogether.
Prevent entry creation other than PM Entries on tasks with a procedure.

File:

• trunk/grails-app/controllers/EntryDetailedController.groovy (modified) (1 diff)

trunk/grails-app/controllers/EntryDetailedController.groovy

@@ -113 +113 @@
         def taskInstance = Task.read(params.taskId)
 
-        if(!taskInstance) {
-            params.errorMessage = g.message(code:"default.not.found", args:['Task',params.taskId])
-            render(contentType:"text/json", status: 403, template: "/shared/messages")
-            return
-        }
-
-        // Check for Complete task.
-        if(taskInstance.taskStatus.id == 3) {
-            params.errorMessage = g.message(code:"task.operationNotPermittedOnCompleteTask")
-            render(contentType:"text/json", status: 403, template: "/shared/messages")
-            return
-        }
-
-        // Success.
         def entryInstance = new Entry()
         entryInstance.task = taskInstance
         entryInstance.entryType = EntryType.read(params.entryTypeId)
+
+        // Check if we should create this entry.
+        def checkResult = taskService.checkCreateEntry(entryInstance)
+        if(checkResult.error) {
+            params.errorMessage = g.message(code: checkResult.error.code)
+            render(contentType:"text/json", status: 403, template: "/shared/messages")
+            return
+        }
+
+        // Success.
         def model = ['entryInstance': entryInstance]