Index: /trunk/grails-app/domain/Task.groovy
===================================================================
--- /trunk/grails-app/domain/Task.groovy	(revision 167)
+++ /trunk/grails-app/domain/Task.groovy	(revision 168)
@@ -5,5 +5,5 @@
     TaskPriority taskPriority
     TaskType taskType
-    Task    parentTask
+    Task parentTask
     Person leadPerson
     Asset primaryAsset
Index: /trunk/grails-app/i18n/messages.properties
===================================================================
--- /trunk/grails-app/i18n/messages.properties	(revision 167)
+++ /trunk/grails-app/i18n/messages.properties	(revision 168)
@@ -105,2 +105,18 @@
 navigation.nav.inventory=Inventory
 navigation.nav.assets=Assets
+
+# FilterPane plugin, properties.
+fp.property.text.associatedAssets.name=Associated Asset
+fp.property.text.primaryAsset.name=Primary Asset
+fp.property.text.isActive=Active
+fp.property.text.isScheduled=Scheduled
+fp.property.text.isApproved=Approved
+fp.property.text.taskGroup.name=Group
+fp.property.text.taskPriority.name=Priority
+fp.property.text.taskStatus.name=Status
+fp.property.text.description=Description
+fp.property.text.comment=Comment
+fp.property.text.leadPerson.lastName=Lead Person (Last Name)
+fp.property.text.leadPerson.firstName=Lead Person (First Name)
+fp.property.text.taskType.name=Type
+
Index: /trunk/grails-app/views/person/create.gsp
===================================================================
--- /trunk/grails-app/views/person/create.gsp	(revision 167)
+++ /trunk/grails-app/views/person/create.gsp	(revision 168)
@@ -102,5 +102,5 @@
                         </td>
                         <td valign="top" class="value ${hasErrors(bean:person,field:'department','errors')}">
-                            <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${person?.department?.id}" noSelection="['null':'']"></g:select>
+                            <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${person?.department?.id}" noSelection="['null':'--None--']"></g:select>
                         </td>
                     </tr>
Index: /trunk/grails-app/views/person/edit.gsp
===================================================================
--- /trunk/grails-app/views/person/edit.gsp	(revision 167)
+++ /trunk/grails-app/views/person/edit.gsp	(revision 168)
@@ -109,5 +109,5 @@
                         </td>
                         <td valign="top" class="value ${hasErrors(bean:person,field:'department','errors')}">
-                            <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${person?.department?.id}" noSelection="['null':'']"></g:select>
+                            <g:select optionKey="id" from="${Department.list()}" name="department.id" value="${person?.department?.id}" noSelection="['null':'--None--']"></g:select>
                         </td>
                     </tr>
Index: /trunk/grails-app/views/taskDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/create.gsp	(revision 167)
+++ /trunk/grails-app/views/taskDetailed/create.gsp	(revision 168)
@@ -64,5 +64,5 @@
                                     <g:helpBalloon class="helpballoon" code="task.targetCompletionDate" />
                                 </td>
-                            </tr> 
+                            </tr>
                         
                             <tr class="prop">
@@ -74,5 +74,28 @@
                                     <g:helpBalloon code="task.leadPerson" />
                                 </td>
-                            </tr> 
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="primaryAsset">Primary Asset:</label>
+                                </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: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">
@@ -126,5 +149,5 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:taskInstance,field:'parentTask','errors')}">
-                                    <g:select optionKey="id" from="${Task.list()}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'']"></g:select>
+                                    <g:select optionKey="id" from="${Task.list()}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'--None--']"></g:select>
                                 </td>
                             </tr> 
Index: /trunk/grails-app/views/taskDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/edit.gsp	(revision 167)
+++ /trunk/grails-app/views/taskDetailed/edit.gsp	(revision 168)
@@ -78,5 +78,28 @@
                                     <g:select optionKey="id" from="${Person.list()}" name="leadPerson.id" value="${taskInstance?.leadPerson?.id}" ></g:select>
                                 </td>
-                            </tr> 
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="primaryAsset">Primary Asset:</label>
+                                </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: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()}"
+                                                    optionKey="id" size="5" multiple="yes" 
+                                                    value="${taskInstance?.associatedAssets.id}"  noSelection="['':'--None--']"/>
+                                    <g:helpBalloon  class="helpballoon" code="task.associatedAssets" />
+                                </td>
+                            </tr>
                         
                             <tr class="prop">
@@ -130,5 +153,5 @@
                                 </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':'']"></g:select>
+                                    <g:select optionKey="id" from="${possibleParentList}" name="parentTask.id" value="${taskInstance?.parentTask?.id}" noSelection="['null':'--None--']"></g:select>
                                 </td>
                             </tr>
Index: /trunk/grails-app/views/taskDetailed/search.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/search.gsp	(revision 167)
+++ /trunk/grails-app/views/taskDetailed/search.gsp	(revision 168)
@@ -95,10 +95,23 @@
                                     class="overlayPane"
                                     additionalProperties="id"
-                                    associatedProperties="leadPerson.lastName, taskGroup.name, taskPriority.name"
+                                    associatedProperties="taskPriority.name,
+                                                                                leadPerson.lastName,
+                                                                                leadPerson.firstName,
+                                                                                taskGroup.name,
+                                                                                associatedAssets.name,
+                                                                                primaryAsset.name,
+                                                                                taskStatus.name,
+                                                                                taskType.name"
                                     filterPropertyValues="${['taskPriority.name':[values:TaskPriority.list()],
-                                                                                'leadPerson.lastName':[values:Person.executeQuery('select t.lastName from Person t')],
+                                                                                'leadPerson.lastName':[values:Person.executeQuery('select distinct t.lastName from Person t')],
+                                                                                'leadPerson.firstName':[values:Person.executeQuery('select distinct t.firstName from Person t')],
                                                                                 'taskGroup.name':[values:TaskGroup.list()],
+                                                                                'associatedAssets.name':[values:Asset.list()],
+                                                                                'primaryAsset.name':[values:Asset.list()],
+                                                                                'taskStatus.name':[values:TaskStatus.list()],
+                                                                                'taskType.name':[values:TaskType.list()],
                                                                                 targetCompletionDate:[years:2020..2000,precision:'day'],
-                                                                                targetStartDate:[years:2020..2000,precision:'day']]}"/>
+                                                                                targetStartDate:[years:2020..2000,precision:'day']
+                                                                                ]}"/>
         </div> <!-- end body  -->
 
Index: /trunk/grails-app/views/taskDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/taskDetailed/show.gsp	(revision 167)
+++ /trunk/grails-app/views/taskDetailed/show.gsp	(revision 168)
@@ -83,4 +83,24 @@
 
                                     <tr class="prop">
+                                        <td valign="top" class="name">Primary Asset:</td>
+
+                                        <td valign="top" class="value"><g:link controller="assetDetailed" action="show" id="${taskInstance?.primaryAsset?.id}">${taskInstance?.primaryAsset?.encodeAsHTML()}</g:link></td>
+
+                                    </tr>
+
+                                    <tr class="prop">
+                                        <td valign="top" class="name">Associated Assets:</td>
+
+                                        <td  valign="top" style="text-align:left;" class="value">
+                                            <ul>
+                                            <g:each var="a" in="${taskInstance.associatedAssets}">
+                                                <li>${a?.encodeAsHTML()}</li>
+                                            </g:each>
+                                            </ul>
+                                        </td>
+
+                                    </tr>
+
+                                    <tr class="prop">
                                         <td valign="top" class="name">Task Priority:</td>