Index: trunk/grails-app/controllers/TaskDetailedController.groovy
===================================================================
--- trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 486)
+++ trunk/grails-app/controllers/TaskDetailedController.groovy	(revision 487)
@@ -598,8 +598,11 @@
         // Default leadPerson to current user, unless supplied in params.
         taskInstance.leadPerson = authService.currentUser
+
+        // Apply params, overiding anything above.
         taskInstance.properties = params
 
         def scheduledTaskTypes = taskService.scheduledTaskTypes
         def scheduledTaskPriorities = taskService.scheduledTaskPriorities
+        taskInstance.scheduled = true
         taskInstance.taskPriority = scheduledTaskPriorities.default
         return ['taskInstance': taskInstance,
Index: trunk/grails-app/views/taskDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/create.gsp	(revision 486)
+++ trunk/grails-app/views/taskDetailed/create.gsp	(revision 487)
@@ -69,5 +69,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${Person.findAllByIsActive(true).sort { p1, p2 -> p1.firstName.compareToIgnoreCase(p2.firstName) }}"
+                                                        name="leadPerson.id"
+                                                        value="${taskInstance?.leadPerson?.id}" >
+                                    </g:select>
                                     <g:helpBalloon code="task.leadPerson" />
                                 </td>
@@ -79,5 +83,10 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}">
-                                    <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}" noSelection="['null':'--None--']"></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="primaryAsset.id"
+                                                        value="${taskInstance?.primaryAsset?.id}"
+                                                        noSelection="['null':'--None--']" >
+                                    </g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
                                 </td>
@@ -90,7 +99,8 @@
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'associatedAssets','errors')}">
                                     <g:select id="associatedAssets" name="associatedAssets"
-                                                    from="${Asset.list()}"
+                                                    from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
                                                     size="5" multiple="yes" optionKey="id"
-                                                    value="${taskInstance?.associatedAssets?.id}"  noSelection="['':'--None--']"/>
+                                                    value="${taskInstance?.associatedAssets?.id}"  noSelection="['':'--None--']" >
+                                    </g:select>
                                     <g:helpBalloon code="task.associatedAssets" />
                                 </td>
@@ -102,5 +112,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
-                                    <g:select optionKey="id" from="${scheduledTaskPriorities}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${scheduledTaskPriorities}"
+                                                        name="taskPriority.id"
+                                                        value="${taskInstance?.taskPriority?.id}" >
+                                    </g:select>
                                 </td>
                             </tr>
@@ -114,13 +128,4 @@
                                 </td>
                             </tr>
-
-<!--                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="parentTask">Parent Task:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
-                                    <g:select optionKey="id" from="${Task.findAllByTrash(false)}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'--None--']"></g:select>
-                                </td>
-                            </tr> -->
                         
                             <tr class="prop">
@@ -129,5 +134,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskGroup','errors')}">
-                                    <g:select optionKey="id" from="${TaskGroup.list()}" name="taskGroup.id" value="${taskInstance?.taskGroup?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${TaskGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="taskGroup.id"
+                                                        value="${taskInstance?.taskGroup?.id}" >
+                                    </g:select>
                                 </td>
                             </tr> 
@@ -138,5 +147,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
-                                    <g:select optionKey="id" from="${scheduledTaskTypes}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${scheduledTaskTypes}"
+                                                        name="taskType.id"
+                                                        value="${taskInstance?.taskType?.id}" >
+                                    </g:select>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/taskDetailed/createImmediateCallout.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/createImmediateCallout.gsp	(revision 486)
+++ trunk/grails-app/views/taskDetailed/createImmediateCallout.gsp	(revision 487)
@@ -63,5 +63,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}">
-                                    <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}" noSelection="['null':'--None--']"></g:select>
+                                    <g:select optionKey="id"
+                                                    from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                    name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}"
+                                                    noSelection="['null':'--None--']">
+                                    </g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
                                 </td>
@@ -74,5 +78,5 @@
                                 <td valign="top" class="value ${hasErrors(bean:entryFaultInstance,field:'productionReference','errors')}">
                                     <g:select optionKey="id"
-                                                        from="${ProductionReference.findAllByIsActive(true)}"
+                                                        from="${ProductionReference.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
                                                         name="entryFault.productionReference.id"
                                                         value="${entryFaultInstance?.productionReference?.id}"
Index: trunk/grails-app/views/taskDetailed/createUnscheduled.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/createUnscheduled.gsp	(revision 486)
+++ trunk/grails-app/views/taskDetailed/createUnscheduled.gsp	(revision 487)
@@ -71,5 +71,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${Person.findAllByIsActive(true).sort { p1, p2 -> p1.firstName.compareToIgnoreCase(p2.firstName) }}"
+                                                        name="leadPerson.id"
+                                                        value="${taskInstance?.leadPerson?.id}" >
+                                    </g:select>
                                     <g:helpBalloon code="task.leadPerson" />
                                 </td>
@@ -81,21 +85,12 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}">
-                                    <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}" noSelection="['null':'--None--']"></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="primaryAsset.id"
+                                                        value="${taskInstance?.primaryAsset?.id}"
+                                                        noSelection="['null':'--None--']"></g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
                                 </td>
                             </tr>
-
-<!--                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="associatedAssets">Associated Assets:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'associatedAssets','errors')}">
-                                    <g:select id="associatedAssets" name="associatedAssets"
-                                                    from="${Asset.list()}"
-                                                    size="5" multiple="yes" optionKey="id"
-                                                    value="${taskInstance?.associatedAssets?.id}"  noSelection="['':'--None--']"/>
-                                    <g:helpBalloon code="task.associatedAssets" />
-                                </td>
-                            </tr>-->
                         
                             <tr class="prop">
@@ -104,25 +99,11 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
-                                    <g:select optionKey="id" from="${unscheduledTaskPriorities}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${unscheduledTaskPriorities}"
+                                                        name="taskPriority.id"
+                                                        value="${taskInstance?.taskPriority?.id}" >
+                                    </g:select>
                                 </td>
                             </tr>
-                        
-<!--                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="scheduled">Scheduled:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'scheduled','errors')}">
-                                    <g:checkBox name="scheduled" value="${taskInstance?.scheduled}" ></g:checkBox>
-                                </td>
-                            </tr>-->
-
-<!--                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="parentTask">Parent Task:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
-                                    <g:select optionKey="id" from="${Task.findAllByTrash(false)}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'--None--']"></g:select>
-                                </td>
-                            </tr> -->
                         
                             <tr class="prop">
@@ -131,5 +112,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskGroup','errors')}">
-                                    <g:select optionKey="id" from="${TaskGroup.list()}" name="taskGroup.id" value="${taskInstance?.taskGroup?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${TaskGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="taskGroup.id"
+                                                        value="${taskInstance?.taskGroup?.id}" >
+                                    </g:select>
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/taskDetailed/edit.gsp	(revision 486)
+++ trunk/grails-app/views/taskDetailed/edit.gsp	(revision 487)
@@ -45,13 +45,4 @@
                             </g:if>
 
-<!--                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="parentTask">Parent Task:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
-                                    <g:select optionKey="id" from="${possibleParentList}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'--None--']"></g:select>
-                                </td>
-                            </tr>-->
-
                             <tr class="prop">
                                 <td valign="top" class="name">
@@ -95,5 +86,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'leadPerson','errors')}">
-                                    <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${Person.findAllByIsActive(true).sort { p1, p2 -> p1.firstName.compareToIgnoreCase(p2.firstName) }}"
+                                                        name="leadPerson.id"
+                                                        value="${taskInstance?.leadPerson?.id}" >
+                                    </g:select>
                                 </td>
                             </tr>
@@ -104,5 +99,10 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'primaryAsset','errors')}">
-                                    <g:select optionKey="id" from="${Asset.list()}" name="primaryAsset.id" value="${taskInstance?.primaryAsset?.id}"  noSelection="['null':'--None--']"></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="primaryAsset.id"
+                                                        value="${taskInstance?.primaryAsset?.id}"
+                                                        noSelection="['null':'--None--']">
+                                    </g:select>
                                     <g:helpBalloon code="task.primaryAsset" />
                                 </td>
@@ -114,8 +114,11 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'associatedAssets','errors')}">
-                                    <g:select id="associatedAssets" name="associatedAssets"
-                                                    from="${Asset.list()}"
+                                    <g:select id="associatedAssets"
+                                                    name="associatedAssets"
+                                                    from="${Asset.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
                                                     optionKey="id" size="5" multiple="yes" 
-                                                    value="${taskInstance?.associatedAssets.id}"  noSelection="['':'--None--']"/>
+                                                    value="${taskInstance?.associatedAssets.id}"
+                                                    noSelection="['':'--None--']" >
+                                    </g:select>
                                     <g:helpBalloon  class="helpballoon" code="task.associatedAssets" />
                                 </td>
@@ -127,5 +130,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskPriority','errors')}">
-                                    <g:select optionKey="id" from="${TaskPriority.list()}" name="taskPriority.id" value="${taskInstance?.taskPriority?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${TaskPriority.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="taskPriority.id"
+                                                        value="${taskInstance?.taskPriority?.id}" >
+                                    </g:select>
                                 </td>
                             </tr>
@@ -136,7 +143,11 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskBudgetStatus','errors')}">
-                                    <g:select optionKey="id" from="${TaskBudgetStatus.list()}" name="taskBudgetStatus.id" value="${taskInstance?.taskBudgetStatus?.id}" ></g:select>
-                                </td>
-                            </tr> 
+                                    <g:select optionKey="id"
+                                                        from="${TaskBudgetStatus.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="taskBudgetStatus.id"
+                                                        value="${taskInstance?.taskBudgetStatus?.id}" >
+                                    </g:select>
+                                </td>
+                            </tr>
                         
                             <tr class="prop">
@@ -154,7 +165,11 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskGroup','errors')}">
-                                    <g:select optionKey="id" from="${TaskGroup.list()}" name="taskGroup.id" value="${taskInstance?.taskGroup?.id}" ></g:select>
-                                </td>
-                            </tr> 
+                                    <g:select optionKey="id"
+                                                        from="${TaskGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="taskGroup.id"
+                                                        value="${taskInstance?.taskGroup?.id}" >
+                                    </g:select>
+                                </td>
+                            </tr>
                         
                             <tr class="prop">
@@ -163,5 +178,9 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'taskType','errors')}">
-                                    <g:select optionKey="id" from="${TaskType.list()}" name="taskType.id" value="${taskInstance?.taskType?.id}" ></g:select>
+                                    <g:select optionKey="id"
+                                                        from="${TaskType.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"
+                                                        name="taskType.id"
+                                                        value="${taskInstance?.taskType?.id}" >
+                                    </g:select>
                                 </td>
                             </tr>