Index: /trunk/grails-app/conf/Config.groovy
===================================================================
--- /trunk/grails-app/conf/Config.groovy	(revision 379)
+++ /trunk/grails-app/conf/Config.groovy	(revision 380)
@@ -239,4 +239,12 @@
             [order:91, controller:'inventoryLocationDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
         ]
+    ],
+    [order:90, controller:'inventoryGroupDetailed', title:'inventoryGroup', action:'list',
+        subItems: [
+            [order:10, controller:'inventoryGroupDetailed', title:'Inventory Group List', action:'list', isVisible: { true }],
+            [order:20, controller:'inventoryGroupDetailed', title:'Create', action:'create', isVisible: { true }],
+            [order:90, controller:'inventoryGroupDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }],
+            [order:91, controller:'inventoryGroupDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }]
+        ]
     ]
 ]
Index: unk/grails-app/controllers/InventoryGroupController.groovy
===================================================================
--- /trunk/grails-app/controllers/InventoryGroupController.groovy	(revision 379)
+++ 	(revision )
@@ -1,99 +1,0 @@
-import org.codehaus.groovy.grails.plugins.springsecurity.Secured
-
-class InventoryGroupController 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)
-        [ inventoryGroupInstanceList: InventoryGroup.list( params ), inventoryGroupInstanceTotal: InventoryGroup.count() ]
-    }
-
-    def show = {
-        def inventoryGroupInstance = InventoryGroup.get( params.id )
-
-        if(!inventoryGroupInstance) {
-            flash.message = "InventoryGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else { return [ inventoryGroupInstance : inventoryGroupInstance ] }
-    }
-
-    def delete = {
-        def inventoryGroupInstance = InventoryGroup.get( params.id )
-        if(inventoryGroupInstance) {
-            try {
-                inventoryGroupInstance.delete(flush:true)
-                flash.message = "InventoryGroup ${params.id} deleted"
-                redirect(action:list)
-            }
-            catch(org.springframework.dao.DataIntegrityViolationException e) {
-                flash.message = "InventoryGroup ${params.id} could not be deleted"
-                redirect(action:show,id:params.id)
-            }
-        }
-        else {
-            flash.message = "InventoryGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def edit = {
-        def inventoryGroupInstance = InventoryGroup.get( params.id )
-
-        if(!inventoryGroupInstance) {
-            flash.message = "InventoryGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-        else {
-            return [ inventoryGroupInstance : inventoryGroupInstance ]
-        }
-    }
-
-    def update = {
-        def inventoryGroupInstance = InventoryGroup.get( params.id )
-        if(inventoryGroupInstance) {
-            if(params.version) {
-                def version = params.version.toLong()
-                if(inventoryGroupInstance.version > version) {
-                    
-                    inventoryGroupInstance.errors.rejectValue("version", "inventoryGroup.optimistic.locking.failure", "Another user has updated this InventoryGroup while you were editing.")
-                    render(view:'edit',model:[inventoryGroupInstance:inventoryGroupInstance])
-                    return
-                }
-            }
-            inventoryGroupInstance.properties = params
-            if(!inventoryGroupInstance.hasErrors() && inventoryGroupInstance.save(flush: true)) {
-                flash.message = "InventoryGroup ${params.id} updated"
-                redirect(action:show,id:inventoryGroupInstance.id)
-            }
-            else {
-                render(view:'edit',model:[inventoryGroupInstance:inventoryGroupInstance])
-            }
-        }
-        else {
-            flash.message = "InventoryGroup not found with id ${params.id}"
-            redirect(action:list)
-        }
-    }
-
-    def create = {
-        def inventoryGroupInstance = new InventoryGroup()
-        inventoryGroupInstance.properties = params
-        return ['inventoryGroupInstance':inventoryGroupInstance]
-    }
-
-    def save = {
-        def inventoryGroupInstance = new InventoryGroup(params)
-        if(!inventoryGroupInstance.hasErrors() && inventoryGroupInstance.save(flush: true)) {
-            flash.message = "InventoryGroup ${inventoryGroupInstance.id} created"
-            redirect(action:show,id:inventoryGroupInstance.id)
-        }
-        else {
-            render(view:'create',model:[inventoryGroupInstance:inventoryGroupInstance])
-        }
-    }
-}
Index: /trunk/grails-app/controllers/InventoryGroupDetailedController.groovy
===================================================================
--- /trunk/grails-app/controllers/InventoryGroupDetailedController.groovy	(revision 380)
+++ /trunk/grails-app/controllers/InventoryGroupDetailedController.groovy	(revision 380)
@@ -0,0 +1,113 @@
+import org.codehaus.groovy.grails.plugins.springsecurity.Secured
+
+@Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_InventoryManager'])
+class InventoryGroupDetailedController extends BaseController {
+
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_InventoryManager', 'ROLE_InventoryUser'])
+    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']
+
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_InventoryManager', 'ROLE_InventoryUser'])
+    def list = {
+        params.max = Math.min( params.max ? params.max.toInteger() : 10,  100)
+        [ inventoryGroupInstanceList: InventoryGroup.list( params ), inventoryGroupInstanceTotal: InventoryGroup.count() ]
+    }
+
+    @Secured(['ROLE_AppAdmin', 'ROLE_Manager', 'ROLE_InventoryManager', 'ROLE_InventoryUser'])
+    def show = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Show)
+            params.action='show'
+
+        def inventoryGroupInstance = InventoryGroup.get( params.id )
+
+        if(!inventoryGroupInstance) {
+            flash.message = "InventoryGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else { return [ inventoryGroupInstance : inventoryGroupInstance ] }
+    }
+
+    def delete = {
+        def inventoryGroupInstance = InventoryGroup.get( params.id )
+        if(inventoryGroupInstance) {
+            try {
+                inventoryGroupInstance.delete(flush:true)
+                flash.message = "InventoryGroup ${params.id} deleted"
+                redirect(action:list)
+            }
+            catch(org.springframework.dao.DataIntegrityViolationException e) {
+                flash.message = "InventoryGroup ${params.id} could not be deleted"
+                redirect(action:show,id:params.id)
+            }
+        }
+        else {
+            flash.message = "InventoryGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def edit = {
+
+        // In the case of an actionSubmit button, rewrite action name from 'index'.
+        if(params._action_Edit)
+            params.action='edit'
+
+        def inventoryGroupInstance = InventoryGroup.get( params.id )
+
+        if(!inventoryGroupInstance) {
+            flash.message = "InventoryGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+        else {
+            return [ inventoryGroupInstance : inventoryGroupInstance ]
+        }
+    }
+
+    def update = {
+        def inventoryGroupInstance = InventoryGroup.get( params.id )
+        if(inventoryGroupInstance) {
+            if(params.version) {
+                def version = params.version.toLong()
+                if(inventoryGroupInstance.version > version) {
+                    
+                    inventoryGroupInstance.errors.rejectValue("version", "inventoryGroup.optimistic.locking.failure", "Another user has updated this InventoryGroup while you were editing.")
+                    render(view:'edit',model:[inventoryGroupInstance:inventoryGroupInstance])
+                    return
+                }
+            }
+            inventoryGroupInstance.properties = params
+            if(!inventoryGroupInstance.hasErrors() && inventoryGroupInstance.save(flush: true)) {
+                flash.message = "InventoryGroup ${params.id} updated"
+                redirect(action:show,id:inventoryGroupInstance.id)
+            }
+            else {
+                render(view:'edit',model:[inventoryGroupInstance:inventoryGroupInstance])
+            }
+        }
+        else {
+            flash.message = "InventoryGroup not found with id ${params.id}"
+            redirect(action:list)
+        }
+    }
+
+    def create = {
+        def inventoryGroupInstance = new InventoryGroup()
+        inventoryGroupInstance.properties = params
+        return ['inventoryGroupInstance':inventoryGroupInstance]
+    }
+
+    def save = {
+        def inventoryGroupInstance = new InventoryGroup(params)
+        if(!inventoryGroupInstance.hasErrors() && inventoryGroupInstance.save(flush: true)) {
+            flash.message = "InventoryGroup ${inventoryGroupInstance.id} created"
+            redirect(action:show,id:inventoryGroupInstance.id)
+        }
+        else {
+            render(view:'create',model:[inventoryGroupInstance:inventoryGroupInstance])
+        }
+    }
+}
Index: /trunk/grails-app/views/inventoryGroupDetailed/create.gsp
===================================================================
--- /trunk/grails-app/views/inventoryGroupDetailed/create.gsp	(revision 380)
+++ /trunk/grails-app/views/inventoryGroupDetailed/create.gsp	(revision 380)
@@ -0,0 +1,64 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Create InventoryGroup</title>
+        <nav:resources override="true"/>
+    </head>
+    <body>
+        <div class="nav">
+            <nav:renderSubItems group="navAlt"/>
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${inventoryGroupInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${inventoryGroupInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form action="save" method="post" >
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryGroupInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:inventoryGroupInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryGroupInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:inventoryGroupInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryGroupInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${inventoryGroupInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><input class="save" type="submit" value="Create" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /trunk/grails-app/views/inventoryGroupDetailed/edit.gsp
===================================================================
--- /trunk/grails-app/views/inventoryGroupDetailed/edit.gsp	(revision 380)
+++ /trunk/grails-app/views/inventoryGroupDetailed/edit.gsp	(revision 380)
@@ -0,0 +1,84 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Edit InventoryGroup</title>
+        <nav:resources override="true"/>
+    </head>
+    <body>
+        <div class="nav">
+            <nav:renderSubItems group="navAlt"/>
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <g:hasErrors bean="${inventoryGroupInstance}">
+            <div class="errors">
+                <g:renderErrors bean="${inventoryGroupInstance}" as="list" />
+            </div>
+            </g:hasErrors>
+            <g:form method="post" >
+                <input type="hidden" name="id" value="${inventoryGroupInstance?.id}" />
+                <input type="hidden" name="version" value="${inventoryGroupInstance?.version}" />
+                <div class="dialog">
+                    <table>
+                        <tbody>
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="name">Name:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryGroupInstance,field:'name','errors')}">
+                                    <input type="text" maxlength="50" id="name" name="name" value="${fieldValue(bean:inventoryGroupInstance,field:'name')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="description">Description:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryGroupInstance,field:'description','errors')}">
+                                    <input type="text" maxlength="100" id="description" name="description" value="${fieldValue(bean:inventoryGroupInstance,field:'description')}"/>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="isActive">Is Active:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryGroupInstance,field:'isActive','errors')}">
+                                    <g:checkBox name="isActive" value="${inventoryGroupInstance?.isActive}" ></g:checkBox>
+                                </td>
+                            </tr> 
+                        
+                            <tr class="prop">
+                                <td valign="top" class="name">
+                                    <label for="inventoryItems">Inventory Items:</label>
+                                </td>
+                                <td valign="top" class="value ${hasErrors(bean:inventoryGroupInstance,field:'inventoryItems','errors')}">
+                                    
+<ul>
+<g:each var="i" in="${inventoryGroupInstance?.inventoryItems?}">
+    <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
+</g:each>
+</ul>
+<g:link controller="inventoryItemDetailed" params="['inventoryGroup.id':inventoryGroupInstance?.id]" action="create">Add InventoryItem</g:link>
+
+                                </td>
+                            </tr> 
+                        
+                        </tbody>
+                    </table>
+                </div>
+                <div class="buttons">
+                    <span class="button"><g:actionSubmit class="save" value="Update" /></span>
+                    <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </div>
+            </g:form>
+        </div>
+    </body>
+</html>
Index: /trunk/grails-app/views/inventoryGroupDetailed/list.gsp
===================================================================
--- /trunk/grails-app/views/inventoryGroupDetailed/list.gsp	(revision 380)
+++ /trunk/grails-app/views/inventoryGroupDetailed/list.gsp	(revision 380)
@@ -0,0 +1,63 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>InventoryGroup List</title>
+        <nav:resources override="true"/>
+    </head>
+    <body>
+        <div class="nav">
+            <nav:renderSubItems group="navAlt"/>
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="list">
+                <table>
+                    <thead>
+                        <tr>
+                        
+                            <g:sortableColumn property="id" title="Id" />
+
+                            <g:sortableColumn property="name" title="Name" />
+
+                            <g:sortableColumn property="description" title="Description" />
+
+                            <g:sortableColumn property="isActive" title="Is Active" />
+
+                            <th></th>
+                        
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <g:each in="${inventoryGroupInstanceList}" status="i" var="inventoryGroupInstance">
+                        <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/inventoryGroupDetailed/show/${inventoryGroupInstance.id}"'/>
+                        
+                            <td>${fieldValue(bean:inventoryGroupInstance, field:'id')}</td>
+                        
+                            <td>${fieldValue(bean:inventoryGroupInstance, field:'name')}</td>
+                        
+                            <td>${fieldValue(bean:inventoryGroupInstance, field:'description')}</td>
+                        
+                            <td>${fieldValue(bean:inventoryGroupInstance, field:'isActive')}</td>
+
+                            <td>
+                                <g:link action="show" id="${inventoryGroupInstance.id}">
+                                    <img  src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" />
+                                </g:link>
+                            </td>
+                        
+                        </tr>
+                    </g:each>
+                    </tbody>
+                </table>
+            </div>
+            <div class="paginateButtons">
+                <g:paginate total="${inventoryGroupInstanceTotal}" />
+            </div>
+        </div>
+    </body>
+</html>
Index: /trunk/grails-app/views/inventoryGroupDetailed/show.gsp
===================================================================
--- /trunk/grails-app/views/inventoryGroupDetailed/show.gsp	(revision 380)
+++ /trunk/grails-app/views/inventoryGroupDetailed/show.gsp	(revision 380)
@@ -0,0 +1,76 @@
+
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+        <meta name="layout" content="main" />
+        <title>Show InventoryGroup</title>
+        <nav:resources override="true"/>
+    </head>
+    <body>
+        <div class="nav">
+            <nav:renderSubItems group="navAlt"/>
+        </div>
+        <div class="body">
+            <g:if test="${flash.message}">
+            <div class="message">${flash.message}</div>
+            </g:if>
+            <div class="dialog">
+                <table>
+                    <tbody>
+
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Id:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:inventoryGroupInstance, field:'id')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Name:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:inventoryGroupInstance, field:'name')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Description:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:inventoryGroupInstance, field:'description')}</td>
+                            
+                        </tr>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Is Active:</td>
+                            
+                            <td valign="top" class="value">${fieldValue(bean:inventoryGroupInstance, field:'isActive')}</td>
+                            
+                        </tr>
+                    
+                        <tr class="prop">
+                            <td valign="top" class="name">Inventory Items:</td>
+                            
+                            <td  valign="top" style="text-align:left;" class="value">
+                                <ul>
+                                <g:each var="i" in="${inventoryGroupInstance.inventoryItems}">
+                                    <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>
+                                </g:each>
+                                </ul>
+                            </td>
+                    
+                    </tbody>
+                </table>
+            </div>
+            <div class="buttons">
+                <g:form>
+                    <input type="hidden" name="id" value="${inventoryGroupInstance?.id}" />
+                    <span class="button"><g:actionSubmit class="edit" value="Edit" /></span>
+                    <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span>
+                </g:form>
+            </div>
+        </div>
+    </body>
+</html>
