Index: trunk/grails-app/views/assembly/create.gsp
===================================================================
--- trunk/grails-app/views/assembly/create.gsp	(revision 118)
+++ trunk/grails-app/views/assembly/create.gsp	(revision 122)
@@ -47,13 +47,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="lifeplan">Lifeplan:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assemblyInstance,field:'lifeplan','errors')}">
-                                    <g:select optionKey="id" from="${LifePlan.list()}" name="lifeplan.id" value="${assemblyInstance?.lifeplan?.id}" ></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="name">Name:</label>
                                 </td>
Index: trunk/grails-app/views/assembly/edit.gsp
===================================================================
--- trunk/grails-app/views/assembly/edit.gsp	(revision 118)
+++ trunk/grails-app/views/assembly/edit.gsp	(revision 122)
@@ -59,8 +59,15 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="lifeplan">Lifeplan:</label>
+                                    <label for="maintenanceActions">Maintenance Actions:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assemblyInstance,field:'lifeplan','errors')}">
-                                    <g:select optionKey="id" from="${LifePlan.list()}" name="lifeplan.id" value="${assemblyInstance?.lifeplan?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:assemblyInstance,field:'maintenanceActions','errors')}">
+                                    
+<ul>
+<g:each var="m" in="${assemblyInstance?.maintenanceActions?}">
+    <li><g:link controller="maintenanceAction" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="maintenanceAction" params="['assembly.id':assemblyInstance?.id]" action="create">Add MaintenanceAction</g:link>
+
                                 </td>
                             </tr> 
Index: trunk/grails-app/views/assembly/list.gsp
===================================================================
--- trunk/grails-app/views/assembly/list.gsp	(revision 118)
+++ trunk/grails-app/views/assembly/list.gsp	(revision 122)
@@ -28,6 +28,4 @@
                    	        <g:sortableColumn property="isActive" title="Is Active" />
                         
-                   	        <th>Lifeplan</th>
-                   	    
                    	        <g:sortableColumn property="name" title="Name" />
                         
@@ -44,6 +42,4 @@
                             <td>${fieldValue(bean:assemblyInstance, field:'isActive')}</td>
                         
-                            <td>${fieldValue(bean:assemblyInstance, field:'lifeplan')}</td>
-                        
                             <td>${fieldValue(bean:assemblyInstance, field:'name')}</td>
                         
Index: trunk/grails-app/views/assembly/show.gsp
===================================================================
--- trunk/grails-app/views/assembly/show.gsp	(revision 118)
+++ trunk/grails-app/views/assembly/show.gsp	(revision 122)
@@ -58,7 +58,13 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Lifeplan:</td>
+                            <td valign="top" class="name">Maintenance Actions:</td>
                             
-                            <td valign="top" class="value"><g:link controller="lifePlan" action="show" id="${assemblyInstance?.lifeplan?.id}">${assemblyInstance?.lifeplan?.encodeAsHTML()}</g:link></td>
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="m" in="${assemblyInstance.maintenanceActions}">
+                                    <li><g:link controller="maintenanceAction" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
                             
                         </tr>