Changeset 633 for trunk/grails-app/views
- Timestamp:
- Jul 19, 2010, 8:47:38 AM (14 years ago)
- Location:
- trunk/grails-app/views
- Files:
-
- 5 added
- 10 edited
-
appCore/manager.gsp (modified) (2 diffs)
-
costCodeDetailed/create.gsp (modified) (1 diff)
-
costCodeDetailed/edit.gsp (modified) (1 diff)
-
costCodeDetailed/list.gsp (modified) (2 diffs)
-
costCodeDetailed/show.gsp (modified) (2 diffs)
-
inventoryItemPurchaseDetailed/create.gsp (modified) (2 diffs)
-
inventoryItemPurchaseDetailed/edit.gsp (modified) (3 diffs)
-
person/create.gsp (modified) (1 diff)
-
person/edit.gsp (modified) (1 diff)
-
person/show.gsp (modified) (1 diff)
-
purchasingGroupDetailed (added)
-
purchasingGroupDetailed/create.gsp (added)
-
purchasingGroupDetailed/edit.gsp (added)
-
purchasingGroupDetailed/list.gsp (added)
-
purchasingGroupDetailed/show.gsp (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/grails-app/views/appCore/manager.gsp
r624 r633 27 27 <a href="${createLink(controller:'personGroupDetailed', action:'list')}">Assigned Groups</a> 28 28 <br /> 29 <a href="${createLink(controller:'costCodeDetailed', action:'list')}">Cost Codes</a> 30 <br /> 29 31 <a href="${createLink(controller:'departmentDetailed', action:'list')}">Departments</a> 30 32 <br /> … … 38 40 <br /> 39 41 <a href="${createLink(controller:'manufacturerDetailed', action:'list')}">Manufacturers</a> 42 <br /> 43 <a href="${createLink(controller:'purchasingGroupDetailed', action:'list')}">Purchasing Groups</a> 40 44 <br /> 41 45 <a href="${createLink(controller:'productionReferenceDetailed', action:'list')}">Production Reference</a> -
trunk/grails-app/views/costCodeDetailed/create.gsp
r441 r633 35 35 <tr class="prop"> 36 36 <td valign="top" class="name"> 37 <label for="purchasingGroup">Purchasing Group:</label> 38 </td> 39 <td valign="top" class="value ${hasErrors(bean:costCodeInstance,field:'purchasingGroup','errors')}"> 40 <g:select optionKey="id" 41 from="${PurchasingGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}" 42 name="purchasingGroup.id" 43 value="${costCodeInstance?.purchasingGroup?.id}" > 44 </g:select> 45 <p> 46 <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link> 47 </p> 48 </td> 49 </tr> 50 51 <tr class="prop"> 52 <td valign="top" class="name"> 37 53 <label for="description">Description:</label> 38 54 </td> -
trunk/grails-app/views/costCodeDetailed/edit.gsp
r441 r633 37 37 <tr class="prop"> 38 38 <td valign="top" class="name"> 39 <label for="purchasingGroup">Purchasing Group:</label> 40 </td> 41 <td valign="top" class="value ${hasErrors(bean:costCodeInstance,field:'purchasingGroup','errors')}"> 42 <g:select optionKey="id" 43 from="${PurchasingGroup.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}" 44 name="purchasingGroup.id" 45 value="${costCodeInstance?.purchasingGroup?.id}" > 46 </g:select> 47 <p> 48 <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link> 49 </p> 50 </td> 51 </tr> 52 53 <tr class="prop"> 54 <td valign="top" class="name"> 39 55 <label for="description">Description:</label> 40 56 </td> -
trunk/grails-app/views/costCodeDetailed/list.gsp
r498 r633 23 23 <g:sortableColumn property="name" title="Name" /> 24 24 25 <g:sortableColumn property="purchasingGroup" title="Group" /> 26 25 27 <g:sortableColumn property="description" title="Description" /> 26 28 … … 41 43 <td onclick='window.location = "${request.getContextPath()}/costCodeDetailed/show/${costCodeInstance.id}"'> 42 44 ${fieldValue(bean:costCodeInstance, field:'name')} 45 </td> 46 47 <td onclick='window.location = "${request.getContextPath()}/costCodeDetailed/show/${costCodeInstance.id}"'> 48 ${fieldValue(bean:costCodeInstance, field:'purchasingGroup')} 43 49 </td> 44 50 -
trunk/grails-app/views/costCodeDetailed/show.gsp
r441 r633 34 34 35 35 <tr class="prop"> 36 <td valign="top" class="name">Purchasing Group:</td> 37 <td valign="top" class="value"> 38 <g:link controller="purchasingGroupDetailed" action="show" id="${costCodeInstance?.purchasingGroup?.id}"> 39 ${costCodeInstance?.purchasingGroup?.encodeAsHTML()} 40 </g:link> 41 </td> 42 </tr> 43 44 <tr class="prop"> 36 45 <td valign="top" class="name">Description:</td> 37 46 … … 44 53 45 54 <td valign="top" class="value">${fieldValue(bean:costCodeInstance, field:'isActive')}</td> 46 47 </tr>48 49 <tr class="prop">50 <td valign="top" class="name">Inventory Item Purchases:</td>51 52 <td valign="top" style="text-align:left;" class="value">53 <ul>54 <g:each var="i" in="${costCodeInstance.inventoryItemPurchases}">55 <li><g:link controller="inventoryItemPurchaseDetailed" action="show" id="${i.id}">${i?.encodeAsHTML()}</g:link></li>56 </g:each>57 </ul>58 </td>59 55 60 56 </tr> -
trunk/grails-app/views/inventoryItemPurchaseDetailed/create.gsp
r609 r633 15 15 <div class="body"> 16 16 <g:render template="/shared/messages" /> 17 <g:if test="${!costCodes}" > 18 <div class="errors"> 19 <ul> 20 <li><g:message code="inventoryItemPurchase.costCodes.not.found" /><li> 21 </div> 22 </g:if> 17 23 <g:hasErrors bean="${inventoryItemPurchaseInstance}"> 18 24 <div class="errors"> … … 66 72 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'costCode','errors')}"> 67 73 <g:select optionKey="id" 68 from="${ CostCode.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) }}"74 from="${ costCodes }" 69 75 name="costCode.id" 70 76 value="${inventoryItemPurchaseInstance?.costCode?.id}" -
trunk/grails-app/views/inventoryItemPurchaseDetailed/edit.gsp
r609 r633 59 59 </td> 60 60 </tr> 61 61 62 62 <tr class="prop"> 63 63 <td valign="top" class="name"> … … 65 65 </td> 66 66 <td valign="top" class="value ${hasErrors(bean:inventoryItemPurchaseInstance,field:'costCode','errors')}"> 67 <g:select optionKey="id" 68 from="${ CostCode.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }" 69 name="costCode.id" 70 value="${inventoryItemPurchaseInstance?.costCode?.id}" > 71 </g:select> 67 <g:if test="${costCodes}"> 68 <g:select optionKey="id" 69 from="${ costCodes }" 70 name="costCode.id" 71 value="${inventoryItemPurchaseInstance.costCode?.id}" > 72 </g:select> 73 </g:if> 74 <g:else> 75 <g:link controller="costCodeDetailed" action="show" id="${inventoryItemPurchaseInstance?.costCode?.id}"> 76 ${inventoryItemPurchaseInstance?.costCode?.encodeAsHTML()} 77 </g:link> 78 </g:else> 72 79 <g:helpBalloon code="inventoryItemPurchase.cost.code" /> 73 80 </td> … … 96 103 from="${ Supplier.findAllByIsActive(true).sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }" 97 104 name="supplier.id" 98 value="${inventoryItemPurchaseInstance?.supplier?.id}" 99 noSelection="['null':/${g.message(code:'default.please.select.text')}/]"> 105 value="${inventoryItemPurchaseInstance?.supplier?.id}"> 100 106 </g:select> 101 107 <g:helpBalloon code="inventoryItemPurchase.supplier" /> -
trunk/grails-app/views/person/create.gsp
r506 r633 105 105 106 106 <tr class="prop"> 107 <td valign="top" class="name"> 108 <label for="purchasingGroups">Purchasing Groups:</label> 109 </td> 110 <td valign="top" class="value ${hasErrors(bean:person,field:'purchasingGroups','errors')}"> 111 <g:helpBalloon class="helpballoon" code="person.purchasingGroups" /> 112 <custom:checkBoxList name="purchasingGroups" 113 from="${PurchasingGroup.findAllByIsActive(true)}" 114 value="${person?.purchasingGroups?.collect{it.id}}" 115 optionKey="id" 116 sortBy="name" 117 linkController="purchasingGroupDetailed" 118 linkAction="show"/> 119 <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link> 120 </td> 121 </tr> 122 123 <tr class="prop"> 107 124 <td valign="top" class="name" align="left"> 108 125 Authorities: -
trunk/grails-app/views/person/edit.gsp
r506 r633 144 144 145 145 <tr class="prop"> 146 <td valign="top" class="name"> 147 <label for="purchasingGroups">Purchasing Groups:</label> 148 </td> 149 <td valign="top" class="value ${hasErrors(bean:person,field:'purchasingGroups','errors')}"> 150 <g:helpBalloon class="helpballoon" code="person.purchasingGroups" /> 151 <custom:checkBoxList name="purchasingGroups" 152 from="${PurchasingGroup.findAllByIsActive(true)}" 153 value="${person?.purchasingGroups?.collect{it.id}}" 154 optionKey="id" 155 sortBy="name" 156 linkController="purchasingGroupDetailed" 157 linkAction="show"/> 158 <g:link controller="purchasingGroupDetailed" action="create">+Add Group</g:link> 159 </td> 160 </tr> 161 162 <tr class="prop"> 146 163 <td valign="top" class="name" align="left"> 147 164 Authorities: -
trunk/grails-app/views/person/show.gsp
r402 r633 89 89 <td valign="top" class="value"> 90 90 <ul> 91 <g:each in="${person.personGroups}" var='group'> 92 <li>${group}</li> 91 <g:each var='group' in="${ person.personGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"> 92 <li> 93 <g:link controller="personGroupDetailed" 94 action="show" 95 id="${group.id}"> 96 ${group.encodeAsHTML()} 97 </g:link> 98 </li> 99 </g:each> 100 </ul> 101 </td> 102 </tr> 103 104 <tr class="prop"> 105 <td valign="top" class="name">Purchasing Groups:</td> 106 <td valign="top" class="value"> 107 <ul> 108 <g:each var='a' in="${ person.purchasingGroups.sort { p1, p2 -> p1.name.compareToIgnoreCase(p2.name) } }"> 109 <li> 110 <g:link controller="purchasingGroupDetailed" 111 action="show" 112 id="${a.id}"> 113 ${a.encodeAsHTML()} 114 </g:link> 115 </li> 93 116 </g:each> 94 117 </ul>
Note: See TracChangeset
for help on using the changeset viewer.
