Changeset 601 for trunk/grails-app/services/TaskService.groovy

Timestamp:

Jun 20, 2010, 2:28:29 PM (14 years ago)

Author:

gav

Message:

Add default.please.select.text and default.none.select.text messages.
Update Task views and service to use new messages.

File:

• trunk/grails-app/services/TaskService.groovy (modified) (1 diff)

trunk/grails-app/services/TaskService.groovy

@@ -97 +97 @@
             }
 
-            // Default status to "not started" if not supplied.
-            params.taskStatus = params.taskStatus ?: TaskStatus.get(1)
-
-            // Set budgetStatus.
-            if(params.taskType?.id?.toLong() == 1 || params.taskType?.id?.toLong() == 2) // Immediate Callout or Unsheduled Breakin.
-                params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(1) // Unplanned.
-            else
-                params.taskBudgetStatus = params.taskBudgetStatus ?: TaskBudgetStatus.get(2) // Planned.
-
             def taskInstance = new Task(params)
             result.taskInstance = taskInstance
+
+            // Set taskStatus if not supplied.
+            if(!params.taskStatus)
+                taskInstance.taskStatus = TaskStatus.read(1) // Not Started
+
+            // Set budgetStatus if not supplied.
+            if(!params.taskBudgetStatus) {
+                if(taskInstance.taskType?.id == 1 || taskInstance.taskType?.id == 2) // Immediate Callout or Unsheduled Breakin.
+                    taskInstance.taskBudgetStatus = TaskBudgetStatus.read(1) // Unplanned.
+                else
+                    taskInstance.taskBudgetStatus = TaskBudgetStatus.read(2) // Planned.
+            }
 
             if(result.taskInstance.parentTask?.trash)