Index: trunk/grails-app/views/assembly/create.gsp
===================================================================
--- trunk/grails-app/views/assembly/create.gsp	(revision 122)
+++ trunk/grails-app/views/assembly/create.gsp	(revision 131)
@@ -26,4 +26,13 @@
                     <table>
                         <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="assetType">Asset Type:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assemblyInstance,field:'assetType','errors')}">
+                                    <g:select optionKey="id" from="${AssetType.list()}" name="assetType.id" value="${assemblyInstance?.assetType?.id}" ></g:select>
+                                </td>
+                            </tr> 
                         
                             <tr class="prop">
Index: trunk/grails-app/views/assembly/edit.gsp
===================================================================
--- trunk/grails-app/views/assembly/edit.gsp	(revision 122)
+++ trunk/grails-app/views/assembly/edit.gsp	(revision 131)
@@ -32,8 +32,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="assetTypes">Asset Types:</label>
+                                    <label for="assetType">Asset Type:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assemblyInstance,field:'assetTypes','errors')}">
-                                    
+                                <td valign="top" class="value ${hasErrors(bean:assemblyInstance,field:'assetType','errors')}">
+                                    <g:select optionKey="id" from="${AssetType.list()}" name="assetType.id" value="${assemblyInstance?.assetType?.id}" ></g:select>
                                 </td>
                             </tr> 
@@ -87,8 +87,11 @@
                                 </td>
                                 <td valign="top" class="value ${hasErrors(bean:assemblyInstance,field:'subAssemblies','errors')}">
-                                    <g:select name="subAssemblies"
-from="${SubAssembly.list()}"
-size="5" multiple="yes" optionKey="id"
-value="${assemblyInstance?.subAssemblies}" />
+                                    
+<ul>
+<g:each var="s" in="${assemblyInstance?.subAssemblies?}">
+    <li><g:link controller="subAssembly" action="show" id="${s.id}">${s?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="subAssembly" params="['assembly.id':assemblyInstance?.id]" action="create">Add SubAssembly</g:link>
 
                                 </td>
Index: trunk/grails-app/views/assembly/list.gsp
===================================================================
--- trunk/grails-app/views/assembly/list.gsp	(revision 122)
+++ trunk/grails-app/views/assembly/list.gsp	(revision 131)
@@ -24,4 +24,6 @@
                    	        <g:sortableColumn property="id" title="Id" />
                         
+                   	        <th>Asset Type</th>
+                   	    
                    	        <g:sortableColumn property="description" title="Description" />
                         
@@ -37,4 +39,6 @@
                         
                             <td><g:link action="show" id="${assemblyInstance.id}">${fieldValue(bean:assemblyInstance, field:'id')}</g:link></td>
+                        
+                            <td>${fieldValue(bean:assemblyInstance, field:'assetType')}</td>
                         
                             <td>${fieldValue(bean:assemblyInstance, field:'description')}</td>
Index: trunk/grails-app/views/assembly/show.gsp
===================================================================
--- trunk/grails-app/views/assembly/show.gsp	(revision 122)
+++ trunk/grails-app/views/assembly/show.gsp	(revision 131)
@@ -31,13 +31,7 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Asset Types:</td>
+                            <td valign="top" class="name">Asset Type:</td>
                             
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="a" in="${assemblyInstance.assetTypes}">
-                                    <li><g:link controller="assetType" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
+                            <td valign="top" class="value"><g:link controller="assetType" action="show" id="${assemblyInstance?.assetType?.id}">${assemblyInstance?.assetType?.encodeAsHTML()}</g:link></td>
                             
                         </tr>