Index: /branches/features/taskProcedureRework/grails-app/controllers/TaskProcedureDetailedController.groovy
===================================================================
--- /branches/features/taskProcedureRework/grails-app/controllers/TaskProcedureDetailedController.groovy	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/controllers/TaskProcedureDetailedController.groovy	(revision 762)
@@ -99,5 +99,5 @@
             taskProcedureInstance.properties = params
 
-            def toBeDeleted = taskProcedureInstance.maintenanceActions.findAll {it._deleted}
+            def toBeDeleted = taskProcedureInstance.maintenanceActions.findAll {it.deleted}
             if(toBeDeleted) {
                 taskProcedureInstance.maintenanceActions.removeAll(toBeDeleted)
@@ -134,5 +134,5 @@
     def save = {
         def taskProcedureInstance = new TaskProcedure(params)
-        def taskInstance = Task.get(params.parentTask.id)
+        def taskInstance = Task.get(params.linkedTask.id)
 
         if(!taskProcedureInstance.hasErrors() && taskProcedureInstance.save(flush: true)) {
Index: /branches/features/taskProcedureRework/grails-app/domain/MaintenanceAction.groovy
===================================================================
--- /branches/features/taskProcedureRework/grails-app/domain/MaintenanceAction.groovy	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/domain/MaintenanceAction.groovy	(revision 762)
@@ -11,5 +11,5 @@
     Integer procedureStepNumber
 
-    boolean deleted
+    Boolean deleted
     static transients = [ 'deleted' ]
 
Index: /branches/features/taskProcedureRework/grails-app/domain/TaskProcedure.groovy
===================================================================
--- /branches/features/taskProcedureRework/grails-app/domain/TaskProcedure.groovy	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/domain/TaskProcedure.groovy	(revision 762)
@@ -1,15 +1,24 @@
-import org.apache.commons.collections.list.LazyList;
-import org.apache.commons.collections.FactoryUtils;
+import org.apache.commons.collections.list.LazyList
+import org.apache.commons.collections.FactoryUtils
 
 class TaskProcedure {
 
-    Task parentTask
+    Task linkedTask
+
+    def getDescription() { linkedTask.description }
+    def getAsset() { linkedTask.primaryAsset }
+
     List maintenanceActions = new ArrayList()
+
     static hasMany = [tasks: Task, maintenanceActions: MaintenanceAction]
+
+    def getMaintenanceActionLazyList() {
+        return LazyList.decorate(maintenanceActions, FactoryUtils.instantiateFactory(MaintenanceAction.class))
+    }
 
     static mappedBy = [tasks:"taskProcedure"]
 
     static mapping = {
-        maintenanceActions cascade:"all,delete-orphan"
+        maintenanceActions cascade:"all-delete-orphan"
     }
 
@@ -22,7 +31,3 @@
         "${this.id}"
     }
-
-    def getExpandableMaintenanceActionList() {
-        return LazyList.decorate(maintenanceActions, FactoryUtils.instantiateFactory(MaintenanceAction.class))
-    }
 }
Index: /branches/features/taskProcedureRework/grails-app/services/CreateDataService.groovy
===================================================================
--- /branches/features/taskProcedureRework/grails-app/services/CreateDataService.groovy	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/services/CreateDataService.groovy	(revision 762)
@@ -1100,10 +1100,10 @@
 
         taskInstance = Task.get(5)
-        taskProcedureInstance = new TaskProcedure(parentTask: taskInstance)
+        taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance)
         saveAndTest(taskProcedureInstance)
         taskProcedureInstance.addToTasks(taskInstance)
 
         taskInstance = Task.get(7)
-        taskProcedureInstance = new TaskProcedure(parentTask: taskInstance)
+        taskProcedureInstance = new TaskProcedure(linkedTask: taskInstance)
         saveAndTest(taskProcedureInstance)
         taskProcedureInstance.addToTasks(taskInstance)
Index: /branches/features/taskProcedureRework/grails-app/views/taskDetailed/show.gsp
===================================================================
--- /branches/features/taskProcedureRework/grails-app/views/taskDetailed/show.gsp	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/views/taskDetailed/show.gsp	(revision 762)
@@ -519,8 +519,8 @@
 
                         <tr class="prop">
-                            <td valign="top" class="name">Parent Task:</td>
+                            <td valign="top" class="name">Linked Task:</td>
                             <td valign="top" class="value">
-                                <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.parentTask.id}">
-                                    ${taskProcedureInstance.parentTask.encodeAsHTML()}
+                                <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.linkedTask.id}">
+                                    ${taskProcedureInstance.linkedTask.encodeAsHTML()}
                                 </g:link>
                             </td>
Index: /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp
===================================================================
--- /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp	(revision 762)
@@ -6,5 +6,5 @@
         var deleteIcon = "${resource(dir:'images/skin', file:'database_delete.png')}";
         var templateHtml = "<div id='" + htmlId + "' name='" + htmlId + "'>\n";
-        templateHtml += "<input type='text' id='expandableMaintenanceActionList[" + childCount + "].description' name='expandableMaintenanceActionList[" + childCount + "].description' />\n";
+        templateHtml += "<input type='text' id='maintenanceActionLazyList[" + childCount + "].description' name='maintenanceActionLazyList[" + childCount + "].description' />\n";
         templateHtml += "<span onClick='jQuery(\"#" + htmlId + "\").remove();'><img src='" + deleteIcon + "' /></span>\n";
         templateHtml += "</div>\n";
@@ -15,10 +15,12 @@
 
 <div id="childList">
-    <g:each var="m" in="${taskProcedureInstance.maintenanceActions}" status="i">
+    <g:each var="ma" in="${taskProcedureInstance.maintenanceActions}" status="i">
         <div id="maintenanceAction${i}">
-            <g:hiddenField name='expandableMaintenanceActionList[${i}].id' value='${maintenanceAction.id}'/>
-            <g:textField name='expandableMaintenanceActionList[${i}].description' value='${maintenanceAction.description}'/>
-            <input type="hidden" name='expandableMaintenanceActionList[${i}].deleted' id='expandableMaintenanceActionList[${i}].deleted' value='false'/>
-            <span onClick="jQuery('#expandableMaintenanceActionList\\[${i}\\]\\.deleted').val('true'); jQuery('#maintenanceAction${i}').hide()"><img src="${resource(dir:'images/skin', file:'database_delete.png')}" /></span>
+            <g:hiddenField name='maintenanceActionLazyList[${i}].id' value='${ma.id}'/>
+            <g:textField name='maintenanceActionLazyList[${i}].description' value='${ma.description}'/>
+            <input type="hidden" name='maintenanceActionLazyList[${i}].deleted' id='maintenanceActionLazyList[${i}].deleted' value='false'/>
+            <span onClick="jQuery('#maintenanceActionLazyList\\[${i}\\]\\.deleted').val('true'); jQuery('#maintenanceAction${i}').hide()">
+                <img src="${resource(dir:'images/skin', file:'database_delete.png')}" />
+            </span>
         </div>
     </g:each>
Index: /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/create.gsp
===================================================================
--- /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/create.gsp	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/create.gsp	(revision 762)
@@ -23,5 +23,5 @@
 
             <g:form action="save" method="post" >
-            <input type="hidden" name="parentTask.id" value="${taskInstance.id}" />
+            <input type="hidden" name="linkedTask.id" value="${taskInstance.id}" />
 
                 <div class="dialog">
Index: /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/edit.gsp
===================================================================
--- /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/edit.gsp	(revision 762)
@@ -35,9 +35,9 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="taskInstance">Parent Task:</label>
+                                    <label for="taskInstance">Linked Task:</label>
                                 </td>
                                 <td valign="top" name="taskInstance" class="value">
-                                    <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.parentTask.id}">
-                                        ${taskProcedureInstance.parentTask.encodeAsHTML()}
+                                    <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.linkedTask.id}">
+                                        ${taskProcedureInstance.linkedTask.encodeAsHTML()}
                                     </g:link>
                                 </td>
@@ -48,23 +48,7 @@
                                     <label for="maintenanceActions">Maintenance Actions:</label>
                                 </td>
+
                                 <td valign="top" class="value ${hasErrors(bean:taskProcedureInstance,field:'maintenanceActions','errors')}">
-
-                                    <ul>
-                                        <g:each var="m" in="${taskProcedureInstance?.maintenanceActions?}">
-                                            <li>
-                                                <g:link controller="maintenanceActionDetailed"
-                                                                action="show"
-                                                                id="${m.id}">
-                                                    ${m?.encodeAsHTML()}
-                                                </g:link>
-                                            </li>
-                                        </g:each>
-                                    </ul>
-                                    <g:link controller="maintenanceActionDetailed"
-                                                params="['taskProcedure.id':taskProcedureInstance?.id]"
-                                                action="create">
-                                        +Add MaintenanceAction
-                                    </g:link>
-
+                                    <g:render template="maintenanceActions" model="['taskProcedureInstance': taskProcedureInstance]" />
                                 </td>
                             </tr>
Index: /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/list.gsp
===================================================================
--- /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/list.gsp	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/list.gsp	(revision 762)
@@ -39,5 +39,5 @@
 
                                 <g:sortableColumn property="id" title="Id"  params="${filterParams}" />
-                                <th>Task Description</th>
+                                <th>Description</th>
                                 <th>Asset</th>
 
@@ -52,7 +52,7 @@
                                 <td>${fieldValue(bean:taskProcedureInstance, field:'id')}</td>
 
-                                <td>${taskProcedureInstance.parentTask.description.encodeAsHTML()}</td>
+                                <td>${taskProcedureInstance.description.encodeAsHTML()}</td>
 
-                                <td>${taskProcedureInstance.parentTask.primaryAsset?.encodeAsHTML()}</td>
+                                <td>${taskProcedureInstance.asset?.encodeAsHTML()}</td>
 
                                 <td>
Index: /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/show.gsp
===================================================================
--- /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/show.gsp	(revision 761)
+++ /branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/show.gsp	(revision 762)
@@ -26,8 +26,8 @@
 
                         <tr class="prop">
-                            <td valign="top" class="name">Parent Task:</td>
+                            <td valign="top" class="name">Linked Task:</td>
                             <td valign="top" class="value">
-                                <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.parentTask.id}">
-                                    ${taskProcedureInstance.parentTask.encodeAsHTML()}
+                                <g:link controller="taskDetailed" action="show" id="${taskProcedureInstance.linkedTask.id}">
+                                    ${taskProcedureInstance.linkedTask.encodeAsHTML()}
                                 </g:link>
                             </td>
@@ -40,5 +40,5 @@
                                 <ul>
                                 <g:each var="m" in="${taskProcedureInstance.maintenanceActions}">
-                                    <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                    <li>${m?.encodeAsHTML()}</li>
                                 </g:each>
                                 </ul>