Changeset 374 for trunk/grails-app
- Timestamp:
- Feb 18, 2010, 1:20:22 AM (15 years ago)
- Location:
- trunk/grails-app
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/conf/Config.groovy
r367 r374 207 207 [order:91, controller:'maintenancePolicyDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] 208 208 ] 209 ], 210 [order:50, controller:'supplierDetailed', title:'supplier', action:'list', 211 subItems: [ 212 [order:10, controller:'supplierDetailed', title:'Supplier List', action:'list', isVisible: { true }], 213 [order:20, controller:'supplierDetailed', title:'Create', action:'create', isVisible: { true }], 214 [order:90, controller:'supplierDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }], 215 [order:91, controller:'supplierDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] 216 ] 217 ], 218 [order:60, controller:'manufacturerDetailed', title:'manufacturer', action:'list', 219 subItems: [ 220 [order:10, controller:'manufacturerDetailed', title:'Manufacturer List', action:'list', isVisible: { true }], 221 [order:20, controller:'manufacturerDetailed', title:'Create', action:'create', isVisible: { true }], 222 [order:90, controller:'manufacturerDetailed', title:'Show', action:'show', isVisible: { params.action == 'show' }], 223 [order:91, controller:'manufacturerDetailed', title:'Edit', action:'edit', isVisible: { params.action == 'edit' }] 224 ] 209 225 ] 210 226 ] -
trunk/grails-app/controllers/ManufacturerDetailedController.groovy
r372 r374 15 15 16 16 def show = { 17 18 // In the case of an actionSubmit button, rewrite action name from 'index'. 19 if(params._action_Show) 20 { params.action='show' } 21 17 22 def manufacturerInstance = Manufacturer.get( params.id ) 18 23 … … 44 49 45 50 def edit = { 51 52 // In the case of an actionSubmit button, rewrite action name from 'index'. 53 if(params._action_Edit) 54 { params.action='edit' } 55 46 56 def manufacturerInstance = Manufacturer.get( params.id ) 47 57 -
trunk/grails-app/controllers/SupplierDetailedController.groovy
r372 r374 15 15 16 16 def show = { 17 18 // In the case of an actionSubmit button, rewrite action name from 'index'. 19 if(params._action_Show) 20 { params.action='show' } 21 17 22 def supplierInstance = Supplier.get( params.id ) 18 23 … … 44 49 45 50 def edit = { 51 52 // In the case of an actionSubmit button, rewrite action name from 'index'. 53 if(params._action_Edit) 54 { params.action='edit' } 55 46 56 def supplierInstance = Supplier.get( params.id ) 47 57 -
trunk/grails-app/views/manufacturerDetailed/create.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Create Manufacturer</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 < span class="menuButton"><g:link class="list" action="list">Manufacturer List</g:link></span>12 <nav:renderSubItems group="navAlt"/> 12 13 </div> 13 14 <div class="body"> 14 <h1>Create Manufacturer</h1>15 15 <g:if test="${flash.message}"> 16 16 <div class="message">${flash.message}</div> … … 25 25 <table> 26 26 <tbody> 27 28 <tr class="prop"> 29 <td valign="top" class="name"> 30 <label for="name">Name:</label> 31 </td> 32 <td valign="top" class="value ${hasErrors(bean:manufacturerInstance,field:'name','errors')}"> 33 <input type="text" id="name" name="name" value="${fieldValue(bean:manufacturerInstance,field:'name')}"/> 34 </td> 35 </tr> 27 36 28 37 <tr class="prop"> … … 53 62 </tr> 54 63 55 <tr class="prop">56 <td valign="top" class="name">57 <label for="name">Name:</label>58 </td>59 <td valign="top" class="value ${hasErrors(bean:manufacturerInstance,field:'name','errors')}">60 <input type="text" id="name" name="name" value="${fieldValue(bean:manufacturerInstance,field:'name')}"/>61 </td>62 </tr>63 64 64 </tbody> 65 65 </table> -
trunk/grails-app/views/manufacturerDetailed/edit.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Edit Manufacturer</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 <span class="menuButton"><g:link class="list" action="list">Manufacturer List</g:link></span> 12 <span class="menuButton"><g:link class="create" action="create">New Manufacturer</g:link></span> 12 <nav:renderSubItems group="navAlt"/> 13 13 </div> 14 14 <div class="body"> 15 <h1>Edit Manufacturer</h1>16 15 <g:if test="${flash.message}"> 17 16 <div class="message">${flash.message}</div> … … 31 30 <tr class="prop"> 32 31 <td valign="top" class="name"> 33 <label for=" description">Description:</label>32 <label for="name">Name:</label> 34 33 </td> 35 <td valign="top" class="value ${hasErrors(bean:manufacturerInstance,field:' description','errors')}">36 <input type="text" id=" description" name="description" value="${fieldValue(bean:manufacturerInstance,field:'description')}"/>34 <td valign="top" class="value ${hasErrors(bean:manufacturerInstance,field:'name','errors')}"> 35 <input type="text" id="name" name="name" value="${fieldValue(bean:manufacturerInstance,field:'name')}"/> 37 36 </td> 38 37 </tr> … … 40 39 <tr class="prop"> 41 40 <td valign="top" class="name"> 42 <label for=" inventoryItems">Inventory Items:</label>41 <label for="description">Description:</label> 43 42 </td> 44 <td valign="top" class="value ${hasErrors(bean:manufacturerInstance,field:' inventoryItems','errors')}">45 43 <td valign="top" class="value ${hasErrors(bean:manufacturerInstance,field:'description','errors')}"> 44 <input type="text" id="description" name="description" value="${fieldValue(bean:manufacturerInstance,field:'description')}"/> 46 45 </td> 47 46 </tr> … … 64 63 </td> 65 64 </tr> 66 67 <tr class="prop"> 68 <td valign="top" class="name"> 69 <label for="name">Name:</label> 70 </td> 71 <td valign="top" class="value ${hasErrors(bean:manufacturerInstance,field:'name','errors')}"> 72 <input type="text" id="name" name="name" value="${fieldValue(bean:manufacturerInstance,field:'name')}"/> 73 </td> 74 </tr> 65 66 <tr class="prop"> 67 <td valign="top" class="name">Inventory Items:</td> 68 69 <td valign="top" style="text-align:left;" class="value"> 70 <ul> 71 <g:each var="i" in="${manufacturerInstance.inventoryItems}"> 72 <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 73 </g:each> 74 </ul> 75 </td> 76 77 </tr> 75 78 76 79 </tbody> … … 79 82 <div class="buttons"> 80 83 <span class="button"><g:actionSubmit class="save" value="Update" /></span> 84 <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span> 81 85 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> 82 86 </div> -
trunk/grails-app/views/manufacturerDetailed/list.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Manufacturer List</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 < span class="menuButton"><g:link class="create" action="create">New Manufacturer</g:link></span>12 <nav:renderSubItems group="navAlt"/> 12 13 </div> 13 14 <div class="body"> 14 <h1>Manufacturer List</h1>15 15 <g:if test="${flash.message}"> 16 16 <div class="message">${flash.message}</div> … … 21 21 <tr> 22 22 23 <g:sortableColumn property="id" title="Id" /> 24 25 <g:sortableColumn property="description" title="Description" /> 26 27 <g:sortableColumn property="isActive" title="Is Active" /> 28 29 <th>Manufacturer Type</th> 30 31 <g:sortableColumn property="name" title="Name" /> 23 <g:sortableColumn property="id" title="Id" /> 24 25 <g:sortableColumn property="name" title="Name" /> 26 27 <g:sortableColumn property="description" title="Description" /> 28 29 <g:sortableColumn property="isActive" title="Is Active" /> 30 31 <th>Manufacturer Type</th> 32 33 <th></th> 32 34 33 35 </tr> … … 35 37 <tbody> 36 38 <g:each in="${manufacturerInstanceList}" status="i" var="manufacturerInstance"> 37 <tr class="${(i % 2) == 0 ? ' odd' : 'even'}">39 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/manufacturerDetailed/show/${manufacturerInstance.id}"'/> 38 40 39 <td><g:link action="show" id="${manufacturerInstance.id}">${fieldValue(bean:manufacturerInstance, field:'id')}</g:link></td> 41 <td>${fieldValue(bean:manufacturerInstance, field:'id')}</td> 42 43 <td>${fieldValue(bean:manufacturerInstance, field:'name')}</td> 40 44 41 45 <td>${fieldValue(bean:manufacturerInstance, field:'description')}</td> … … 44 48 45 49 <td>${fieldValue(bean:manufacturerInstance, field:'manufacturerType')}</td> 46 47 <td>${fieldValue(bean:manufacturerInstance, field:'name')}</td> 50 51 <td> 52 <g:link action="show" id="${manufacturerInstance.id}"> 53 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" /> 54 </g:link> 55 </td> 48 56 49 57 </tr> -
trunk/grails-app/views/manufacturerDetailed/show.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Show Manufacturer</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 <span class="menuButton"><g:link class="list" action="list">Manufacturer List</g:link></span> 12 <span class="menuButton"><g:link class="create" action="create">New Manufacturer</g:link></span> 12 <nav:renderSubItems group="navAlt"/> 13 13 </div> 14 14 <div class="body"> 15 <h1>Show Manufacturer</h1>16 15 <g:if test="${flash.message}"> 17 16 <div class="message">${flash.message}</div> … … 30 29 31 30 <tr class="prop"> 32 <td valign="top" class="name"> Description:</td>31 <td valign="top" class="name">Name:</td> 33 32 34 <td valign="top" class="value">${fieldValue(bean:manufacturerInstance, field:' description')}</td>33 <td valign="top" class="value">${fieldValue(bean:manufacturerInstance, field:'name')}</td> 35 34 36 35 </tr> 37 36 38 37 <tr class="prop"> 39 <td valign="top" class="name"> Inventory Items:</td>38 <td valign="top" class="name">Description:</td> 40 39 41 <td valign="top" style="text-align:left;" class="value"> 42 <ul> 43 <g:each var="i" in="${manufacturerInstance.inventoryItems}"> 44 <li><g:link controller="inventoryItem" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 45 </g:each> 46 </ul> 47 </td> 40 <td valign="top" class="value">${fieldValue(bean:manufacturerInstance, field:'description')}</td> 48 41 49 42 </tr> … … 59 52 <td valign="top" class="name">Manufacturer Type:</td> 60 53 61 <td valign="top" class="value"><g:link controller="manufacturerType " action="show" id="${manufacturerInstance?.manufacturerType?.id}">${manufacturerInstance?.manufacturerType?.encodeAsHTML()}</g:link></td>54 <td valign="top" class="value"><g:link controller="manufacturerTypeDetailed" action="show" id="${manufacturerInstance?.manufacturerType?.id}">${manufacturerInstance?.manufacturerType?.encodeAsHTML()}</g:link></td> 62 55 63 56 </tr> 64 57 65 58 <tr class="prop"> 66 <td valign="top" class="name"> Name:</td>59 <td valign="top" class="name">Inventory Items:</td> 67 60 68 <td valign="top" class="value">${fieldValue(bean:manufacturerInstance, field:'name')}</td> 61 <td valign="top" style="text-align:left;" class="value"> 62 <ul> 63 <g:each var="i" in="${manufacturerInstance.inventoryItems}"> 64 <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 65 </g:each> 66 </ul> 67 </td> 69 68 70 69 </tr> -
trunk/grails-app/views/supplierDetailed/create.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Create Supplier</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 < span class="menuButton"><g:link class="list" action="list">Supplier List</g:link></span>12 <nav:renderSubItems group="navAlt"/> 12 13 </div> 13 14 <div class="body"> 14 <h1>Create Supplier</h1>15 15 <g:if test="${flash.message}"> 16 16 <div class="message">${flash.message}</div> … … 25 25 <table> 26 26 <tbody> 27 28 <tr class="prop"> 29 <td valign="top" class="name"> 30 <label for="name">Name:</label> 31 </td> 32 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}"> 33 <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/> 34 </td> 35 </tr> 27 36 28 37 <tr class="prop"> … … 41 50 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'isActive','errors')}"> 42 51 <g:checkBox name="isActive" value="${supplierInstance?.isActive}" ></g:checkBox> 43 </td>44 </tr>45 46 <tr class="prop">47 <td valign="top" class="name">48 <label for="name">Name:</label>49 </td>50 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}">51 <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/>52 52 </td> 53 53 </tr> -
trunk/grails-app/views/supplierDetailed/edit.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Edit Supplier</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 <span class="menuButton"><g:link class="list" action="list">Supplier List</g:link></span> 12 <span class="menuButton"><g:link class="create" action="create">New Supplier</g:link></span> 12 <nav:renderSubItems group="navAlt"/> 13 13 </div> 14 14 <div class="body"> 15 <h1>Edit Supplier</h1>16 15 <g:if test="${flash.message}"> 17 16 <div class="message">${flash.message}</div> … … 31 30 <tr class="prop"> 32 31 <td valign="top" class="name"> 33 <label for=" description">Description:</label>32 <label for="name">Name:</label> 34 33 </td> 35 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:' description','errors')}">36 <input type="text" id=" description" name="description" value="${fieldValue(bean:supplierInstance,field:'description')}"/>34 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}"> 35 <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/> 37 36 </td> 38 37 </tr> … … 40 39 <tr class="prop"> 41 40 <td valign="top" class="name"> 42 <label for=" inventoryItems">Inventory Items:</label>41 <label for="description">Description:</label> 43 42 </td> 44 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:' inventoryItems','errors')}">45 43 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'description','errors')}"> 44 <input type="text" id="description" name="description" value="${fieldValue(bean:supplierInstance,field:'description')}"/> 46 45 </td> 47 46 </tr> … … 58 57 <tr class="prop"> 59 58 <td valign="top" class="name"> 60 <label for="name">Name:</label>61 </td>62 <td valign="top" class="value ${hasErrors(bean:supplierInstance,field:'name','errors')}">63 <input type="text" id="name" name="name" value="${fieldValue(bean:supplierInstance,field:'name')}"/>64 </td>65 </tr>66 67 <tr class="prop">68 <td valign="top" class="name">69 59 <label for="supplierType">Supplier Type:</label> 70 60 </td> … … 73 63 </td> 74 64 </tr> 65 66 <tr class="prop"> 67 <td valign="top" class="name">Inventory Items:</td> 68 69 <td valign="top" style="text-align:left;" class="value"> 70 <ul> 71 <g:each var="i" in="${supplierInstance.inventoryItems}"> 72 <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 73 </g:each> 74 </ul> 75 </td> 76 77 </tr> 75 78 76 79 </tbody> … … 79 82 <div class="buttons"> 80 83 <span class="button"><g:actionSubmit class="save" value="Update" /></span> 84 <span class="button"><g:actionSubmit class="cancel" value="Cancel" action="Show"/></span> 81 85 <span class="button"><g:actionSubmit class="delete" onclick="return confirm('Are you sure?');" value="Delete" /></span> 82 86 </div> -
trunk/grails-app/views/supplierDetailed/list.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Supplier List</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 < span class="menuButton"><g:link class="create" action="create">New Supplier</g:link></span>12 <nav:renderSubItems group="navAlt"/> 12 13 </div> 13 14 <div class="body"> 14 <h1>Supplier List</h1>15 15 <g:if test="${flash.message}"> 16 16 <div class="message">${flash.message}</div> … … 21 21 <tr> 22 22 23 <g:sortableColumn property="id" title="Id" /> 24 25 <g:sortableColumn property="description" title="Description" /> 26 27 <g:sortableColumn property="isActive" title="Is Active" /> 28 29 <g:sortableColumn property="name" title="Name" /> 30 31 <th>Supplier Type</th> 23 <g:sortableColumn property="id" title="Id" /> 24 25 <g:sortableColumn property="name" title="Name" /> 26 27 <g:sortableColumn property="description" title="Description" /> 28 29 <g:sortableColumn property="isActive" title="Is Active" /> 30 31 <th>Supplier Type</th> 32 33 <th></th> 32 34 33 35 </tr> … … 35 37 <tbody> 36 38 <g:each in="${supplierInstanceList}" status="i" var="supplierInstance"> 37 <tr class="${(i % 2) == 0 ? ' odd' : 'even'}">39 <tr class="${(i % 2) == 0 ? 'clickableOdd' : 'clickableEven'}" onclick='window.location = "${request.getContextPath()}/supplierDetailed/show/${supplierInstance.id}"'/> 38 40 39 <td><g:link action="show" id="${supplierInstance.id}">${fieldValue(bean:supplierInstance, field:'id')}</g:link></td> 41 <td>${fieldValue(bean:supplierInstance, field:'id')}</td> 42 43 <td>${fieldValue(bean:supplierInstance, field:'name')}</td> 40 44 41 45 <td>${fieldValue(bean:supplierInstance, field:'description')}</td> … … 43 47 <td>${fieldValue(bean:supplierInstance, field:'isActive')}</td> 44 48 45 <td>${fieldValue(bean:supplierInstance, field:'name')}</td>46 47 49 <td>${fieldValue(bean:supplierInstance, field:'supplierType')}</td> 50 51 <td> 52 <g:link action="show" id="${supplierInstance.id}"> 53 <img src="${resource(dir:'images/skin',file:'database_go.png')}" alt="Show" /> 54 </g:link> 55 </td> 48 56 49 57 </tr> -
trunk/grails-app/views/supplierDetailed/show.gsp
r178 r374 6 6 <meta name="layout" content="main" /> 7 7 <title>Show Supplier</title> 8 <nav:resources override="true"/> 8 9 </head> 9 10 <body> 10 11 <div class="nav"> 11 <span class="menuButton"><g:link class="list" action="list">Supplier List</g:link></span> 12 <span class="menuButton"><g:link class="create" action="create">New Supplier</g:link></span> 12 <nav:renderSubItems group="navAlt"/> 13 13 </div> 14 14 <div class="body"> 15 <h1>Show Supplier</h1>16 15 <g:if test="${flash.message}"> 17 16 <div class="message">${flash.message}</div> … … 30 29 31 30 <tr class="prop"> 32 <td valign="top" class="name"> Description:</td>31 <td valign="top" class="name">Name:</td> 33 32 34 <td valign="top" class="value">${fieldValue(bean:supplierInstance, field:' description')}</td>33 <td valign="top" class="value">${fieldValue(bean:supplierInstance, field:'name')}</td> 35 34 36 35 </tr> 37 36 38 37 <tr class="prop"> 39 <td valign="top" class="name"> Inventory Items:</td>38 <td valign="top" class="name">Description:</td> 40 39 41 <td valign="top" style="text-align:left;" class="value"> 42 <ul> 43 <g:each var="i" in="${supplierInstance.inventoryItems}"> 44 <li><g:link controller="inventoryItem" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 45 </g:each> 46 </ul> 47 </td> 40 <td valign="top" class="value">${fieldValue(bean:supplierInstance, field:'description')}</td> 48 41 49 42 </tr> … … 57 50 58 51 <tr class="prop"> 59 <td valign="top" class="name"> Name:</td>52 <td valign="top" class="name">Supplier Type:</td> 60 53 61 <td valign="top" class="value"> ${fieldValue(bean:supplierInstance, field:'name')}</td>54 <td valign="top" class="value"><g:link controller="supplierTypeDetailed" action="show" id="${supplierInstance?.supplierType?.id}">${supplierInstance?.supplierType?.encodeAsHTML()}</g:link></td> 62 55 63 56 </tr> 64 57 65 58 <tr class="prop"> 66 <td valign="top" class="name"> Supplier Type:</td>59 <td valign="top" class="name">Inventory Items:</td> 67 60 68 <td valign="top" class="value"><g:link controller="supplierType" action="show" id="${supplierInstance?.supplierType?.id}">${supplierInstance?.supplierType?.encodeAsHTML()}</g:link></td> 61 <td valign="top" style="text-align:left;" class="value"> 62 <ul> 63 <g:each var="i" in="${supplierInstance.inventoryItems}"> 64 <li><g:link controller="inventoryItemDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li> 65 </g:each> 66 </ul> 67 </td> 69 68 70 69 </tr>
Note: See TracChangeset
for help on using the changeset viewer.