Index: unk/grails-app/controllers/AssetExtendedAttributeController.groovy
===================================================================
--- /trunk/grails-app/controllers/AssetExtendedAttributeController.groovy	(revision 291)
+++ 	(revision )
@@ -1,99 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-class AssetExtendedAttributeController extends BaseAppAdminController {
-    
-    def index = { redirect(action:list,params:params) }
-
-    // the delete, save and update actions only accept POST requests
-    static allowedMethods = [delete:'POST', save:'POST', update:'POST']
-
-    def list = {
-        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
-        [ assetExtendedAttributeInstanceList: AssetExtendedAttribute.list( params ), assetExtendedAttributeInstanceTotal: AssetExtendedAttribute.count() ]
-    }
-
-    def show = {
-        def assetExtendedAttributeInstance = AssetExtendedAttribute.get( params.id )
-
-        if(!assetExtendedAttributeInstance) {
-            flash.message = "AssetExtendedAttribute not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ assetExtendedAttributeInstance : assetExtendedAttributeInstance ] }
-    }
-
-    def delete = {
-        def assetExtendedAttributeInstance = AssetExtendedAttribute.get( params.id )
-        if(assetExtendedAttributeInstance) {
-            try {
-                assetExtendedAttributeInstance.delete(flush:true)
-                flash.message = "AssetExtendedAttribute ${params.id} deleted"
-                redirect(action:list)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "AssetExtendedAttribute ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
-        }
-        else {
-            flash.message = "AssetExtendedAttribute not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-        def assetExtendedAttributeInstance = AssetExtendedAttribute.get( params.id )
-
-        if(!assetExtendedAttributeInstance) {
-            flash.message = "AssetExtendedAttribute not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ assetExtendedAttributeInstance : assetExtendedAttributeInstance ]
-        }
-    }
-
-    def update = {
-        def assetExtendedAttributeInstance = AssetExtendedAttribute.get( params.id )
-        if(assetExtendedAttributeInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(assetExtendedAttributeInstance.version > version) {
-                    
-                    assetExtendedAttributeInstance.errors.rejectValue("version", "assetExtendedAttribute.optimistic.locking.failure", "Another user has updated this AssetExtendedAttribute while you were editing.")
-                    render(view:'edit',model:[assetExtendedAttributeInstance:assetExtendedAttributeInstance])
-                    return
-                }
-            }
-            assetExtendedAttributeInstance.properties = params
-            if(!assetExtendedAttributeInstance.hasErrors() && assetExtendedAttributeInstance.save(flush: true)) {
-                flash.message = "AssetExtendedAttribute ${params.id} updated"
-                redirect(action:show,id:assetExtendedAttributeInstance.id)
-            }
-            else {
-                render(view:'edit',model:[assetExtendedAttributeInstance:assetExtendedAttributeInstance])
-            }
-        }
-        else {
-            flash.message = "AssetExtendedAttribute not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def create = {
-        def assetExtendedAttributeInstance = new AssetExtendedAttribute()
-        assetExtendedAttributeInstance.properties = params
-        return ['assetExtendedAttributeInstance':assetExtendedAttributeInstance]
-    }
-
-    def save = {
-        def assetExtendedAttributeInstance = new AssetExtendedAttribute(params)
-        if(!assetExtendedAttributeInstance.hasErrors() && assetExtendedAttributeInstance.save(flush: true)) {
-            flash.message = "AssetExtendedAttribute ${assetExtendedAttributeInstance.id} created"
-            redirect(action:show,id:assetExtendedAttributeInstance.id)
-        }
-        else {
-            render(view:'create',model:[assetExtendedAttributeInstance:assetExtendedAttributeInstance])
-        }
-    }
-}
Index: /trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy	(revision 291)
+++ /trunk/grails-app/controllers/AssetExtendedAttributeDetailedController.groovy	(revision 292)
@@ -27,5 +27,5 @@
         if(assetExtendedAttributeInstance) {
             try {
-                assetExtendedAttributeInstance.delete()
+                assetExtendedAttributeInstance.delete(flush:true)
                 flash.message = "AssetExtendedAttribute ${params.id} deleted"
                 redirect(action:list)
@@ -77,5 +77,5 @@
         else {
             flash.message = "AssetExtendedAttribute not found with id ${params.id}"
-            redirect(action:edit,id:params.id)
+            redirect(action:list)
         }
     }
Index: /trunk/grails-app/views/assetExtendedAttributeDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/assetExtendedAttributeDetailed/create.gsp	(revision 291)
+++ /trunk/grails-app/views/assetExtendedAttributeDetailed/create.gsp	(revision 292)
@@ -5,5 +5,5 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <meta name="layout" content="main" />
-        <title>Create AssetExtendedAttribute</title>         
+        <title>Create AssetExtendedAttribute</title>
     </head>
     <body>
@@ -28,8 +28,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="assetExtendedAttributeType">Asset Extended Attribute Type:</label>
+                                    <label for="value">Value:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'assetExtendedAttributeType','errors')}">
-                                    <g:select optionKey="id" from="${AssetExtendedAttributeType.list()}" name="assetExtendedAttributeType.id" value="${assetExtendedAttributeInstance?.assetExtendedAttributeType?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'value','errors')}">
+                                    <input type="text" maxlength="100" id="value" name="value" value="${fieldValue(bean:assetExtendedAttributeInstance,field:'value')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${assetExtendedAttributeInstance?.isActive}" ></g:checkBox>
                                 </td>
                             </tr> 
@@ -46,17 +55,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
+                                    <label for="extendedAttributeType">Extended Attribute Type:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${assetExtendedAttributeInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="value">Value:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'value','errors')}">
-                                    <input type="text" id="value" name="value" value="${fieldValue(bean:assetExtendedAttributeInstance,field:'value')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'extendedAttributeType','errors')}">
+                                    <g:select optionKey="id" from="${ExtendedAttributeType.list()}" name="extendedAttributeType.id" value="${assetExtendedAttributeInstance?.extendedAttributeType?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: /trunk/grails-app/views/assetExtendedAttributeDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/assetExtendedAttributeDetailed/edit.gsp	(revision 291)
+++ /trunk/grails-app/views/assetExtendedAttributeDetailed/edit.gsp	(revision 292)
@@ -31,8 +31,17 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="assetExtendedAttributeType">Asset Extended Attribute Type:</label>
+                                    <label for="value">Value:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'assetExtendedAttributeType','errors')}">
-                                    <g:select optionKey="id" from="${AssetExtendedAttributeType.list()}" name="assetExtendedAttributeType.id" value="${assetExtendedAttributeInstance?.assetExtendedAttributeType?.id}" ></g:select>
+                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'value','errors')}">
+                                    <input type="text" maxlength="100" id="value" name="value" value="${fieldValue(bean:assetExtendedAttributeInstance,field:'value')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${assetExtendedAttributeInstance?.isActive}" ></g:checkBox>
                                 </td>
                             </tr> 
@@ -49,17 +58,8 @@
                             <tr class="prop">
                                 <td valign="top" class="name">
-                                    <label for="isActive">Is Active:</label>
+                                    <label for="extendedAttributeType">Extended Attribute Type:</label>
                                 </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'isActive','errors')}">
-                                    <g:checkBox name="isActive" value="${assetExtendedAttributeInstance?.isActive}" ></g:checkBox>
-                                </td>
-                            </tr> 
-                        
-                            <tr class="prop">
-                                <td valign="top" class="name">
-                                    <label for="value">Value:</label>
-                                </td>
-                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'value','errors')}">
-                                    <input type="text" id="value" name="value" value="${fieldValue(bean:assetExtendedAttributeInstance,field:'value')}"/>
+                                <td valign="top" class="value ${hasErrors(bean:assetExtendedAttributeInstance,field:'extendedAttributeType','errors')}">
+                                    <g:select optionKey="id" from="${ExtendedAttributeType.list()}" name="extendedAttributeType.id" value="${assetExtendedAttributeInstance?.extendedAttributeType?.id}" ></g:select>
                                 </td>
                             </tr> 
Index: /trunk/grails-app/views/assetExtendedAttributeDetailed/list.gsp
===================================================================
--- /trunk/grails-app/views/assetExtendedAttributeDetailed/list.gsp	(revision 291)
+++ /trunk/grails-app/views/assetExtendedAttributeDetailed/list.gsp	(revision 292)
@@ -23,36 +23,27 @@
                    	        <g:sortableColumn property="id" title="Id" />
                         
-                   	        <th>Asset Extended Attribute Type</th>
-                   	    
+                   	        <g:sortableColumn property="value" title="Value" />
+                        
+                   	        <g:sortableColumn property="isActive" title="Is Active" />
+                        
                    	        <th>Asset</th>
                    	    
-                   	        <g:sortableColumn property="isActive" title="Is Active" />
-                        
-                   	        <g:sortableColumn property="value" title="Value" />
-
-                            <th></th>
-                        
+                   	        <th>Extended Attribute Type</th>
+                   	    
                         </tr>
                     </thead>
                     <tbody>
                     <g:each in="${assetExtendedAttributeInstanceList}" status="i" var="assetExtendedAttributeInstance">
-                        <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/assetExtendedAttributeDetailed/show/${assetExtendedAttributeInstance.id}"'/>
-
+                        <tr class="${(i % 2) == 0 ? 'odd' : 'even'}">
                         
                             <td><g:link action="show" id="${assetExtendedAttributeInstance.id}">${fieldValue(bean:assetExtendedAttributeInstance, field:'id')}</g:link></td>
                         
-                            <td>${fieldValue(bean:assetExtendedAttributeInstance, field:'assetExtendedAttributeType')}</td>
+                            <td>${fieldValue(bean:assetExtendedAttributeInstance, field:'value')}</td>
+                        
+                            <td>${fieldValue(bean:assetExtendedAttributeInstance, field:'isActive')}</td>
                         
                             <td>${fieldValue(bean:assetExtendedAttributeInstance, field:'asset')}</td>
                         
-                            <td>${fieldValue(bean:assetExtendedAttributeInstance, field:'isActive')}</td>
-                        
-                            <td>${fieldValue(bean:assetExtendedAttributeInstance, field:'value')}</td>
-
-                            <td>
-                                <g:link action="show" id="${assetExtendedAttributeInstance.id}">
-                                    <img  src="${resource(dir:'images/skin',file:'database_table.png')}" alt="Show" />
-                                </g:link>
-                            </td>
+                            <td>${fieldValue(bean:assetExtendedAttributeInstance, field:'extendedAttributeType')}</td>
                         
                         </tr>
Index: /trunk/grails-app/views/assetExtendedAttributeDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/assetExtendedAttributeDetailed/show.gsp	(revision 291)
+++ /trunk/grails-app/views/assetExtendedAttributeDetailed/show.gsp	(revision 292)
@@ -30,14 +30,7 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Asset Extended Attribute Type:</td>
+                            <td valign="top" class="name">Value:</td>
                             
-                            <td valign="top" class="value">${assetExtendedAttributeInstance?.assetExtendedAttributeType?.encodeAsHTML()}</td>
-                            
-                        </tr>
-                    
-                        <tr class="prop">
-                            <td valign="top" class="name">Asset:</td>
-                            
-                            <td valign="top" class="value"><g:link controller="assetDetailed" action="show" id="${assetExtendedAttributeInstance?.asset?.id}">${assetExtendedAttributeInstance?.asset?.encodeAsHTML()}</g:link></td>
+                            <td valign="top" class="value">${fieldValue(bean:assetExtendedAttributeInstance, field:'value')}</td>
                             
                         </tr>
@@ -51,7 +44,14 @@
                     
                         <tr class="prop">
-                            <td valign="top" class="name">Value:</td>
+                            <td valign="top" class="name">Asset:</td>
                             
-                            <td valign="top" class="value">${fieldValue(bean:assetExtendedAttributeInstance, field:'value')}</td>
+                            <td valign="top" class="value"><g:link controller="asset" action="show" id="${assetExtendedAttributeInstance?.asset?.id}">${assetExtendedAttributeInstance?.asset?.encodeAsHTML()}</g:link></td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Extended Attribute Type:</td>
+                            
+                            <td valign="top" class="value"><g:link controller="extendedAttributeType" action="show" id="${assetExtendedAttributeInstance?.extendedAttributeType?.id}">${assetExtendedAttributeInstance?.extendedAttributeType?.encodeAsHTML()}</g:link></td>
                             
                         </tr>