Index: trunk/grails-app/views/assetSubItemDetailed/create.gsp
===================================================================
--- trunk/grails-app/views/assetSubItemDetailed/create.gsp	(revision 284)
+++ trunk/grails-app/views/assetSubItemDetailed/create.gsp	(revision 285)
@@ -12,7 +12,5 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${assetSubItemInstance}">
             <div class="errors">
@@ -29,8 +27,20 @@
                                 <tr class="prop">
                                     <td valign="top" class="name">
-                                        <label for="asset">Parent Item:</label>
+                                        <label for="parentItem">Parent Item:</label>
                                     </td>
                                     <td valign="top" class="value">
                                         ${assetSubItemInstance.parentItem.encodeAsHTML()}
+                                    </td>
+                                </tr>
+                            </g:if>
+
+                            <g:if test="${assetInstance}" >
+                                <g:hiddenField name="asset.id" value="${assetInstance.id}" />
+                                <tr class="prop">
+                                    <td valign="top" class="name">
+                                        <label for="asset">Link with Asset:</label>
+                                    </td>
+                                    <td valign="top" class="value">
+                                        ${assetInstance.encodeAsHTML()}
                                     </td>
                                 </tr>
Index: trunk/grails-app/views/assetSubItemDetailed/edit.gsp
===================================================================
--- trunk/grails-app/views/assetSubItemDetailed/edit.gsp	(revision 284)
+++ trunk/grails-app/views/assetSubItemDetailed/edit.gsp	(revision 285)
@@ -12,7 +12,5 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <g:hasErrors bean="${assetSubItemInstance}">
             <div class="errors">
@@ -56,13 +54,4 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="parentItem">Parent Item:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'parentItem','errors')}">
-                                    <g:select optionKey="id" from="${AssetSubItem.list()}" name="parentItem.id" value="${assetSubItemInstance?.parentItem?.id}" noSelection="['null':'']"></g:select>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
                                     <label for="assetSubItemExtendedAttributes">Asset Sub Item Extended Attributes:</label>
                                 </td>
@@ -76,13 +65,4 @@
 <g:link controller="assetSubItemExtendedAttributeDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add AssetSubItemExtendedAttribute</g:link>
 
-                                </td>
-                            </tr>
-
-                             <tr class="prop">
-                                 <td valign="top" class="name">
-                                    <label for="assets">Assets:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'assets','errors')}">
-                                    
                                 </td>
                             </tr>
@@ -104,6 +84,28 @@
 
                                 </td>
+                            </tr>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="parentItem">Parent Item:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetSubItemInstance,field:'parentItem','errors')}">
+                                    <g:select optionKey="id" from="${AssetSubItem.list()}" name="parentItem.id" value="${assetSubItemInstance?.parentItem?.id}" noSelection="['null':'']"></g:select>
+                                </td>
                             </tr> 
-                        
+
+                            <tr class="prop">
+                                <td valign="top" class="name">Assets:</td>
+
+                                <td  valign="top" style="text-align:left;" class="value">
+                                    <ul>
+                                    <g:each var="a" in="${assetSubItemInstance.assets}">
+                                        <li><g:link controller="assetDetailed" action="show" id="${a.id}">${a?.encodeAsHTML()}</g:link></li>
+                                    </g:each>
+                                    </ul>
+                                </td>
+
+                            </tr>
+
                             <tr class="prop">
                                 <td valign="top" class="name">
@@ -117,5 +119,5 @@
 </g:each>
 </ul>
-<g:link controller="assetSubItemDetailed" params="['assetSubItem.id':assetSubItemInstance?.id]" action="create">Add AssetSubItem</g:link>
+<g:link controller="assetSubItemDetailed" params="['parentItem.id':assetSubItemInstance?.id]" action="create">Add AssetSubItem</g:link>
 
                                 </td>
Index: trunk/grails-app/views/assetSubItemDetailed/show.gsp
===================================================================
--- trunk/grails-app/views/assetSubItemDetailed/show.gsp	(revision 284)
+++ trunk/grails-app/views/assetSubItemDetailed/show.gsp	(revision 285)
@@ -12,7 +12,5 @@
         </div>
         <div class="body">
-            <g:if test="${flash.message}">
-            <div class="message">${flash.message}</div>
-            </g:if>
+            <g:render template="/shared/messages" />
             <div class="dialog">
                 <table>
@@ -49,11 +47,4 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Parent Item:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="assetSubItemDetailed" action="show" id="${assetSubItemInstance?.parentItem?.id}">${assetSubItemInstance?.parentItem?.encodeAsHTML()}</g:link></td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
                             <td valign="top" class="name">Asset Sub Item Extended Attributes:</td>
                             
@@ -65,4 +56,24 @@
                                 </ul>
                             </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Maintenance Actions:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="m" in="${assetSubItemInstance.maintenanceActions}">
+                                    <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Parent Item:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="assetSubItemDetailed" action="show" id="${assetSubItemInstance?.parentItem?.id}">${assetSubItemInstance?.parentItem?.encodeAsHTML()}</g:link></td>
                             
                         </tr>
@@ -79,17 +90,4 @@
                             </td>
 
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Maintenance Actions:</td>
-                            
-                            <td  valign="top" style="text-align:left;" class="value">
-                                <ul>
-                                <g:each var="m" in="${assetSubItemInstance.maintenanceActions}">
-                                    <li><g:link controller="maintenanceActionDetailed" action="show" id="${m.id}">${m?.encodeAsHTML()}</g:link></li>
-                                </g:each>
-                                </ul>
-                            </td>
-                            
                         </tr>